summaryrefslogtreecommitdiff
path: root/library/CMakeLists.txt
diff options
context:
space:
mode:
authorAlexander Gavrilov2012-03-15 14:06:50 +0400
committerAlexander Gavrilov2012-03-15 14:06:50 +0400
commit605ee9669a5cd4d2f69ca8adcbe96c9e62671b87 (patch)
tree6911bc96468e506ed7cbc3d1b8a69e9615dda0b2 /library/CMakeLists.txt
parent87f925e72e7c6f923a595cc930728483a3f1422e (diff)
downloaddfhack-605ee9669a5cd4d2f69ca8adcbe96c9e62671b87.tar.gz
dfhack-605ee9669a5cd4d2f69ca8adcbe96c9e62671b87.tar.bz2
dfhack-605ee9669a5cd4d2f69ca8adcbe96c9e62671b87.tar.xz
Plugin-exported functions now actually work.
Diffstat (limited to 'library/CMakeLists.txt')
-rw-r--r--library/CMakeLists.txt18
1 files changed, 10 insertions, 8 deletions
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 0bda587a..f062be87 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -216,10 +216,11 @@ ENDIF()
ADD_LIBRARY(dfhack SHARED ${PROJECT_SOURCES})
ADD_DEPENDENCIES(dfhack generate_headers)
-ADD_EXECUTABLE(dfhack-run dfhack-run.cpp
- RemoteClient.cpp ColorText.cpp MiscUtils.cpp
- ${PROJECT_PROTO_SRCS})
-ADD_DEPENDENCIES(dfhack-run dfhack)
+ADD_LIBRARY(dfhack-client SHARED RemoteClient.cpp ColorText.cpp MiscUtils.cpp
+ proto/CoreProtocol.pb.cc)
+ADD_DEPENDENCIES(dfhack-client dfhack)
+
+ADD_EXECUTABLE(dfhack-run dfhack-run.cpp)
IF(BUILD_EGGY)
SET_TARGET_PROPERTIES(dfhack PROPERTIES OUTPUT_NAME "egg" )
@@ -231,10 +232,10 @@ endif()
IF(WIN32)
SET_TARGET_PROPERTIES(dfhack PROPERTIES COMPILE_FLAGS "/FI\"Export.h\"" )
- SET_TARGET_PROPERTIES(dfhack-run PROPERTIES COMPILE_FLAGS "/FI\"Export.h\"" )
+ SET_TARGET_PROPERTIES(dfhack-client PROPERTIES COMPILE_FLAGS "/FI\"Export.h\"" )
ELSE()
SET_TARGET_PROPERTIES(dfhack PROPERTIES COMPILE_FLAGS "-include Export.h" )
- SET_TARGET_PROPERTIES(dfhack-run PROPERTIES COMPILE_FLAGS "-include Export.h" )
+ SET_TARGET_PROPERTIES(dfhack-client PROPERTIES COMPILE_FLAGS "-include Export.h" )
ENDIF()
#effectively disables debug builds...
@@ -243,7 +244,8 @@ SET_TARGET_PROPERTIES(dfhack PROPERTIES DEBUG_POSTFIX "-debug" )
TARGET_LINK_LIBRARIES(dfhack protobuf-lite clsocket ${PROJECT_LIBS})
SET_TARGET_PROPERTIES(dfhack PROPERTIES LINK_INTERFACE_LIBRARIES "")
-TARGET_LINK_LIBRARIES(dfhack-run protobuf-lite clsocket)
+TARGET_LINK_LIBRARIES(dfhack-client protobuf-lite clsocket)
+TARGET_LINK_LIBRARIES(dfhack-run dfhack-client)
IF(UNIX)
# On linux, copy our version of the df launch script which sets LD_PRELOAD
@@ -277,7 +279,7 @@ install(FILES xml/symbols.xml
install(FILES ../dfhack.init-example
DESTINATION ${DFHACK_BINARY_DESTINATION})
-install(TARGETS dfhack-run
+install(TARGETS dfhack-run dfhack-client
LIBRARY DESTINATION ${DFHACK_LIBRARY_DESTINATION}
RUNTIME DESTINATION ${DFHACK_LIBRARY_DESTINATION})