mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Changes for DLL build.

Browse source
This commit is contained in:
jules 2012-09-26 21:31:04 +01:00
parent 4cd95c1a66
commit b305389d46
7 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h
View file

@ -80,12 +80,9 @@
#endif
//==============================================================================
#if __LP64__ && (defined(__APPLE_CPP__) || defined(__APPLE_CC__)) // (disable VSTs and RTAS in a 64-bit mac build)
#undef JucePlugin_Build_RTAS
#endif
#if _WIN64 // (disable RTAS in a 64-bit windows build)
#if _WIN64 || (__LP64__ && (defined(__APPLE_CPP__) || defined(__APPLE_CC__)))
#undef JucePlugin_Build_RTAS
#define JucePlugin_Build_RTAS 0
#endif
//==============================================================================

2
modules/juce_core/memory/juce_Memory.h
View file

@ -92,7 +92,7 @@ inline Type* createCopyIfNotNull (const Type* pointer) { return pointer != n
avoiding problems when an object is created in one module and passed across to another where it is deleted.
By piggy-backing on the JUCE_LEAK_DETECTOR macro, these allocators can be injected into most juce classes.
*/
#if JUCE_MSVC && defined (JUCE_DLL) && ! DOXYGEN
#if JUCE_MSVC && (defined (JUCE_DLL) || defined (JUCE_DLL_BUILD)) && ! DOXYGEN
extern JUCE_API void* juceDLL_malloc (size_t);
extern JUCE_API void juceDLL_free (void*);

6
modules/juce_core/system/juce_StandardHeader.h
View file

@ -131,6 +131,12 @@
#define JUCE_API /**< This macro is added to all juce public class declarations. */
#endif
#if JUCE_MSVC && JUCE_DLL_BUILD
#define JUCE_PUBLIC_IN_DLL_BUILD(declaration) public: declaration; private:
#else
#define JUCE_PUBLIC_IN_DLL_BUILD(declaration) declaration;
#endif
/** This macro is added to all juce public function declarations. */
#define JUCE_PUBLIC_FUNCTION JUCE_API JUCE_CALLTYPE

4
modules/juce_gui_basics/widgets/juce_ListBox.h
View file

@ -553,8 +553,8 @@ public:
private:
//==============================================================================
class ListViewport;
class RowComponent;
JUCE_PUBLIC_IN_DLL_BUILD (class ListViewport);
JUCE_PUBLIC_IN_DLL_BUILD (class RowComponent);
friend class ListViewport;
friend class TableListBox;
ListBoxModel* model;

2
modules/juce_gui_basics/widgets/juce_Slider.h
View file

@ -813,7 +813,7 @@ protected:
private:
//==============================================================================
class Pimpl;
JUCE_PUBLIC_IN_DLL_BUILD (class Pimpl);
friend class Pimpl;
friend class ScopedPointer<Pimpl>;
ScopedPointer<Pimpl> pimpl;

2
modules/juce_gui_basics/widgets/juce_TextEditor.h
View file

@ -643,7 +643,7 @@ protected:
private:
//==============================================================================
class Iterator;
class UniformTextSection;
JUCE_PUBLIC_IN_DLL_BUILD (class UniformTextSection);
class TextHolderComponent;
class InsertAction;
class RemoveAction;

2
modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.h
View file

@ -70,7 +70,7 @@ public:
private:
//==============================================================================
class Pimpl;
JUCE_PUBLIC_IN_DLL_BUILD (class Pimpl);
ScopedPointer<Pimpl> pimpl;
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (SystemTrayIconComponent);