summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathis Rosenhauer <rosenhauer@dkrz.de>2014-07-29 17:47:10 +0200
committerMathis Rosenhauer <rosenhauer@dkrz.de>2014-07-29 17:47:10 +0200
commited9ebe822c26f1812aba83baa5df344ecfcf39e8 (patch)
treec3de54b3e433fca30317e766891d4a9d0015e605
parent2a4b99e84d1f34fc742659543273d48775e2c277 (diff)
downloadlibaec-ed9ebe822c26f1812aba83baa5df344ecfcf39e8.tar.gz
libaec-ed9ebe822c26f1812aba83baa5df344ecfcf39e8.tar.bz2
libaec-ed9ebe822c26f1812aba83baa5df344ecfcf39e8.zip
Next attempt to tackle DLLs.
-rw-r--r--CMakeLists.txt13
-rw-r--r--cmake/config.h.in1
-rw-r--r--src/CMakeLists.txt8
-rw-r--r--src/libaec.h4
4 files changed, 13 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc017a7..66cc038 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,14 +26,15 @@ CONFIGURE_FILE(
ADD_DEFINITIONS("-DHAVE_CONFIG_H")
# Allow the developer to select if Dynamic or Static libraries are built
-OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" OFF)
-IF (BUILD_SHARED_LIBS)
- # User wants to build Dynamic Libraries,
- # so change the LIB_TYPE variable to CMake keyword 'SHARED'
+OPTION(BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+IF(BUILD_SHARED_LIBS)
SET (LIB_TYPE SHARED)
ELSE(BUILD_SHARED_LIBS)
- SET (LIB_TYPE STATIC)
-ENDIF (BUILD_SHARED_LIBS)
+ IF(WIN32)
+ MESSAGE(WARNING "You will have to modify libaec.h for static libs.")
+ ENDIF(WIN32)
+ SET(LIB_TYPE STATIC)
+ENDIF(BUILD_SHARED_LIBS)
INCLUDE_DIRECTORIES("${PROJECT_BINARY_DIR}")
INCLUDE_DIRECTORIES("${PROJECT_BINARY_DIR}/src")
diff --git a/cmake/config.h.in b/cmake/config.h.in
index acfb060..9f5fffb 100644
--- a/cmake/config.h.in
+++ b/cmake/config.h.in
@@ -3,4 +3,3 @@
#cmakedefine WORDS_BIGENDIAN 1
#cmakedefine HAVE_DECL___BUILTIN_CLZLL 1
#cmakedefine HAVE_BSR64 1
-#cmakedefine BUILD_SHARED_LIBS 1
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a8d6927..f62f402 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,10 +11,10 @@ SET_TARGET_PROPERTIES(sz PROPERTIES
)
TARGET_LINK_LIBRARIES(sz aec)
-IF(WIN32)
- SET_TARGET_PROPERTIES (aec PROPERTIES DEFINE_SYMBOL "DLL_EXPORT")
- SET_TARGET_PROPERTIES (sz PROPERTIES DEFINE_SYMBOL "DLL_EXPORT")
-ENDIF(WIN32)
+IF(WIN32 AND BUILD_SHARED_LIBS)
+ SET_TARGET_PROPERTIES (aec PROPERTIES DEFINE_SYMBOL "AECDLL_EXPORTS")
+ SET_TARGET_PROPERTIES (sz PROPERTIES DEFINE_SYMBOL "AECDLL_EXPORTS")
+ENDIF(WIN32 AND BUILD_SHARED_LIBS)
ADD_EXECUTABLE(aec_client aec.c)
SET_TARGET_PROPERTIES(aec_client PROPERTIES OUTPUT_NAME "aec")
diff --git a/src/libaec.h b/src/libaec.h
index 5acd241..736a069 100644
--- a/src/libaec.h
+++ b/src/libaec.h
@@ -55,8 +55,8 @@
#include <stddef.h>
-#if _WIN32 && BUILD_SHARED_LIBS
-# ifdef DLL_EXPORT
+#if _WIN32
+# ifdef AECDLL_EXPORTS
# define AEC_SCOPE __declspec(dllexport)
# else
# define AEC_SCOPE extern __declspec(dllimport)