Fixed Windows static lib buid.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c644eb..9b789ab 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,11 +86,12 @@ 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)
-SET (LIB_TYPE STATIC)
 IF (BUILD_SHARED_LIBS)
   # User wants to build Dynamic Libraries,
   # so change the LIB_TYPE variable to CMake keyword 'SHARED'
   SET (LIB_TYPE SHARED)
+ELSE(BUILD_SHARED_LIBS)
+  SET (LIB_TYPE STATIC)
 ENDIF (BUILD_SHARED_LIBS)
 
 INCLUDE_DIRECTORIES("${PROJECT_BINARY_DIR}")

diff --git a/config.h.in b/config.h.in
index 9f5fffb..acfb060 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -3,3 +3,4 @@
 #cmakedefine WORDS_BIGENDIAN 1
 #cmakedefine HAVE_DECL___BUILTIN_CLZLL 1
 #cmakedefine HAVE_BSR64 1
+#cmakedefine BUILD_SHARED_LIBS 1

diff --git a/src/libaec.h b/src/libaec.h
index 49ec078..1d99466 100644 (file)
--- a/src/libaec.h
+++ b/src/libaec.h
@@ -59,15 +59,14 @@
 #  include <config.h>
 #endif
 
-#ifdef _WIN32
+#if _WIN32 && BUILD_SHARED_LIBS
 #  ifdef DLL_EXPORT
-#    define AEC_SCOPE       __declspec(dllexport)
+#    define AEC_SCOPE __declspec(dllexport)
 #  else
-#    define AEC_SCOPE       extern __declspec(dllimport)
+#    define AEC_SCOPE extern __declspec(dllimport)
 #  endif
-#endif
-#ifndef AEC_SCOPE
-#  define AEC_SCOPE         extern
+#else
+#  define AEC_SCOPE extern
 #endif
 
 struct internal_state;