Mercurial > almixer_isolated
changeset 71:36644b1b940b
Removed use of dllimport for Windows.
Johnson Lin reported that he was getting warnings about it. I think the problem is that I didn't handle the case where you compile the files into your project or statically link. In this case you don't want dllexport or dllimport. From what I read, dllimport is optional (an optimization hint). Since this is becoming a nuisance, I rather just remove it rather than require another build flag.
| author | Eric Wing <ewing . public |-at-| gmail . com> |
|---|---|
| date | Wed, 20 Jun 2012 10:46:03 -0700 |
| parents | 7d63f5149d40 |
| children | 398d1cb12448 |
| files | ALmixer.h CircularQueue.h Isolated/ALmixer_RWops.h Isolated/SimpleMutex.h Isolated/SimpleThread.h Isolated/SoundDecoder.h Isolated/tErrorLib.h LinkedList.h |
| diffstat | 8 files changed, 0 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/ALmixer.h Wed Jun 20 10:41:06 2012 -0700 +++ b/ALmixer.h Wed Jun 20 10:46:03 2012 -0700 @@ -136,8 +136,6 @@ #if defined(_WIN32) #if defined(ALMIXER_BUILD_LIBRARY) #define ALMIXER_DECLSPEC __declspec(dllexport) - #else - #define ALMIXER_DECLSPEC __declspec(dllimport) #endif #else #if defined(ALMIXER_BUILD_LIBRARY)
--- a/CircularQueue.h Wed Jun 20 10:41:06 2012 -0700 +++ b/CircularQueue.h Wed Jun 20 10:46:03 2012 -0700 @@ -39,8 +39,6 @@ #if defined(_WIN32) #if defined(C_CIRCULAR_QUEUE_BUILD_LIBRARY) #define C_CIRCULAR_QUEUE_DECLSPEC __declspec(dllexport) - #else - #define C_CIRCULAR_QUEUE_DECLSPEC __declspec(dllimport) #endif #else #if defined(C_CIRCULAR_QUEUE_BUILD_LIBRARY)
--- a/Isolated/ALmixer_RWops.h Wed Jun 20 10:41:06 2012 -0700 +++ b/Isolated/ALmixer_RWops.h Wed Jun 20 10:46:03 2012 -0700 @@ -4,9 +4,6 @@ #if defined(_WIN32) #if defined(ALMIXER_RWOPS_BUILD_LIBRARY) #define ALMIXER_RWOPS_DECLSPEC __declspec(dllexport) - #else - #define ALMIXER_RWOPS_DECLSPEC __declspec(dllimport) - #endif #else #if defined(ALMIXER_RWOPS_BUILD_LIBRARY) #if defined (__GNUC__) && __GNUC__ >= 4
--- a/Isolated/SimpleMutex.h Wed Jun 20 10:41:06 2012 -0700 +++ b/Isolated/SimpleMutex.h Wed Jun 20 10:46:03 2012 -0700 @@ -10,8 +10,6 @@ #if defined(_WIN32) #if defined(SIMPLE_MUTEX_BUILD_LIBRARY) #define SIMPLE_MUTEX_DECLSPEC __declspec(dllexport) - #else - #define SIMPLE_MUTEX_DECLSPEC __declspec(dllimport) #endif #else #if defined(SIMPLE_MUTEX_BUILD_LIBRARY)
--- a/Isolated/SimpleThread.h Wed Jun 20 10:41:06 2012 -0700 +++ b/Isolated/SimpleThread.h Wed Jun 20 10:46:03 2012 -0700 @@ -8,9 +8,6 @@ #if defined(_WIN32) #if defined(SIMPLE_THREAD_BUILD_LIBRARY) #define SIMPLE_THREAD_DECLSPEC __declspec(dllexport) - #else - #define SIMPLE_THREAD_DECLSPEC __declspec(dllimport) - #endif #else #if defined(SIMPLE_THREAD_BUILD_LIBRARY) #if defined (__GNUC__) && __GNUC__ >= 4
--- a/Isolated/SoundDecoder.h Wed Jun 20 10:41:06 2012 -0700 +++ b/Isolated/SoundDecoder.h Wed Jun 20 10:46:03 2012 -0700 @@ -14,8 +14,6 @@ #if defined(_WIN32) #if defined(SOUND_DECODER_BUILD_LIBRARY) #define SOUND_DECODER_DECLSPEC __declspec(dllexport) - #else - #define SOUND_DECODER_DECLSPEC __declspec(dllimport) #endif #else #if defined(SOUND_DECODER_BUILD_LIBRARY)
--- a/Isolated/tErrorLib.h Wed Jun 20 10:41:06 2012 -0700 +++ b/Isolated/tErrorLib.h Wed Jun 20 10:46:03 2012 -0700 @@ -275,8 +275,6 @@ #if defined(_WIN32) #if defined(TERROR_BUILD_LIBRARY) #define TERROR_DECLSPEC __declspec(dllexport) - #else - #define TERROR_DECLSPEC __declspec(dllimport) #endif #else #if defined(TERROR_BUILD_LIBRARY)
--- a/LinkedList.h Wed Jun 20 10:41:06 2012 -0700 +++ b/LinkedList.h Wed Jun 20 10:46:03 2012 -0700 @@ -44,8 +44,6 @@ #if defined(_WIN32) #if defined(C_LINKED_LIST_BUILD_LIBRARY) #define C_LINKED_LIST_DECLSPEC __declspec(dllexport) - #else - #define C_LINKED_LIST_DECLSPEC __declspec(dllimport) #endif #else #if defined(C_LINKED_LIST_BUILD_LIBRARY)