summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan-Peter Nilsson <peppe@pappkartong.se>2011-02-18 20:03:56 +0100
committerJan-Peter Nilsson <peppe@pappkartong.se>2011-03-12 16:55:53 +0100
commitdc4a4a7bfcfe4990dfa022948fe3454610f81b45 (patch)
treec69718c1e0bed10350b4c1a26273f77b73710d98
parentddd70ea9a5538c3441a7f93d304acdfc832f3eb1 (diff)
Compile openmw_esm openmw_esm_store and openmw_terrain as librariesterrain
-rw-r--r--CMakeLists.txt9
-rw-r--r--apps/openmw/CMakeLists.txt3
2 files changed, 10 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f92d6da..d611584 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -151,8 +151,8 @@ set(TERRAIN_HEADER
${COMP_DIR}/terrain/triangulator.hpp)
source_group(components\\terrain FILES ${TERRAIN} ${TERRAIN_HEADER})
-set(COMPONENTS ${BSA} ${NIF} ${NIFOGRE} ${ESM_STORE} ${MISC} ${TO_UTF8}
- ${COMPILER} ${INTERPRETER} ${ESM} ${FILE_FINDER} ${TERRAIN})
+set(COMPONENTS ${BSA} ${NIF} ${NIFOGRE} ${MISC} ${TO_UTF8}
+ ${COMPILER} ${INTERPRETER} ${FILE_FINDER})
set(COMPONENTS_HEADER ${BSA_HEADER} ${NIF_HEADER} ${NIFOGRE_HEADER} ${ESM_STORE_HEADER}
${ESM_HEADER} ${MISC_HEADER} ${COMPILER_HEADER} ${TO_UTF8_HEADER}
${INTERPRETER_HEADER} ${FILE_FINDER_HEADER} ${TERRAIN_HEADER})
@@ -420,3 +420,8 @@ if (WIN32)
#set_target_properties(openmw PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS")
#set_target_properties(openmw PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:WINDOWS")
endif()
+
+
+add_library(openmw_esm STATIC ${ESM})
+add_library(openmw_esm_store STATIC ${ESM_STORE})
+add_library(openmw_terrain STATIC ${TERRAIN})
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index c79de07..8ef3d57 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -239,6 +239,9 @@ target_link_libraries(openmw
caelum
MyGUIEngine
MyGUIOgrePlatform
+ openmw_esm
+ openmw_esm_store
+ openmw_terrain
)
if (APPLE)