summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-06-05 09:31:19 +0200
committerThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-06-05 09:31:19 +0200
commit89a0a0ee96932a4949c756d50a149a1daa55e2da (patch)
tree6a3a07f9d674df1e70726d4716cd997af741dc8f
parentaa40b22314507a2526e7bf2823d4d4f6b5d51c72 (diff)
downloadtmwa-89a0a0ee96932a4949c756d50a149a1daa55e2da.tar.gz
tmwa-89a0a0ee96932a4949c756d50a149a1daa55e2da.tar.bz2
tmwa-89a0a0ee96932a4949c756d50a149a1daa55e2da.tar.xz
tmwa-89a0a0ee96932a4949c756d50a149a1daa55e2da.zip
Fixed tmwa-map linker errors and made tmwa-login and tmwa-char compile
-rw-r--r--CMakeLists.txt31
1 files changed, 25 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d32a9f8..41c77bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,11 +55,29 @@ add_library(tmwa-shared SHARED ${shared_SOURCES}
set_target_properties(tmwa-shared PROPERTIES VERSION 23.10.22.24.0 SOVERSION 0)
# We have four binaries we want to build: tmwa-{login,char,map,admin}
-#add_executable(tmwa-login src/login/main.cpp)
-#target_link_libraries(tmwa-login tmwa-shared)
-#add_executable(tmwa-char src/char/main.cpp)
-#target_link_libraries(tmwa-char tmwa-shared)
+add_executable(tmwa-login ${login_SOURCES}
+ ${generic_SOURCES}
+ ${high_SOURCES}
+ ${io_SOURCES}
+ ${mmo_SOURCES}
+ ${net_SOURCES}
+ ${wire_SOURCES}
+)
+target_link_libraries(tmwa-login tmwa-shared)
+
+add_executable(tmwa-char ${char_SOURCES}
+ ${generic_SOURCES}
+ ${high_SOURCES}
+ ${io_SOURCES}
+ ${mmo_SOURCES}
+ ${net_SOURCES}
+ ${wire_SOURCES}
+)
+target_link_libraries(tmwa-char tmwa-shared)
+
add_executable(tmwa-map ${map_SOURCES}
+ ${ast_SOURCES}
+ ${compat_SOURCES}
${generic_SOURCES}
${high_SOURCES}
${io_SOURCES}
@@ -68,6 +86,7 @@ add_executable(tmwa-map ${map_SOURCES}
${wire_SOURCES}
)
target_link_libraries(tmwa-map tmwa-shared)
+
add_executable(tmwa-admin ${admin_SOURCES}
${generic_SOURCES}
${high_SOURCES}
@@ -78,8 +97,8 @@ add_executable(tmwa-admin ${admin_SOURCES}
)
target_link_libraries(tmwa-admin tmwa-shared)
-add_executable(tmwa-test ${strtest_SOURCES})
-target_link_libraries(tmwa-test tmwa-shared)
+#add_executable(tmwa-test ${strtest_SOURCES})
+#target_link_libraries(tmwa-test tmwa-shared)
# Some sources and includes are generated, such as the protocol headers.
# We defer to generate.make for these rules.