aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2014-08-23 13:37:14 -0700
committerChris Robinson <[email protected]>2014-08-23 13:37:14 -0700
commit0d0222e91ba0852645105419d66cf989a6a598de (patch)
tree4dbf56237c56d18039ac7636c406b0df3222d5e8
parent259e265920f6505554e0625338fbc6e56d0858f2 (diff)
Include the common sources when building statically
-rw-r--r--CMakeLists.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29d359e9..6e473c20 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1022,7 +1022,11 @@ IF(NOT LIBTYPE STREQUAL "STATIC")
ENDIF()
# Build main library
-ADD_LIBRARY(${LIBNAME} ${LIBTYPE} ${OPENAL_OBJS} ${ALC_OBJS})
+IF(LIBTYPE STREQUAL "STATIC")
+ ADD_LIBRARY(${LIBNAME} STATIC ${COMMON_OBJS} ${OPENAL_OBJS} ${ALC_OBJS})
+ELSE()
+ ADD_LIBRARY(${LIBNAME} SHARED ${OPENAL_OBJS} ${ALC_OBJS})
+ENDIF()
SET_PROPERTY(TARGET ${LIBNAME} APPEND PROPERTY COMPILE_DEFINITIONS AL_BUILD_LIBRARY AL_ALEXT_PROTOTYPES)
IF(WIN32 AND ALSOFT_NO_UID_DEFS)
SET_PROPERTY(TARGET ${LIBNAME} APPEND PROPERTY COMPILE_DEFINITIONS AL_NO_UID_DEFS)