From d1f86e52a7c758abdd1a9e7be65edc70e705cb43 Mon Sep 17 00:00:00 2001 From: andy5995 Date: Sat, 6 Oct 2018 23:40:18 -0500 Subject: [PATCH 1/2] rename output library (drop "liblib") closes #266 Best to wait until the build is fixed to merge this. --- source/shared_lib/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt index b478ca3a0..4c3e7e3ad 100644 --- a/source/shared_lib/CMakeLists.txt +++ b/source/shared_lib/CMakeLists.txt @@ -48,6 +48,7 @@ ENDIF() SET(EXTERNAL_LIBS "") SET(TARGET_NAME "libzetaglest") + IF(BUILD_MODEL_VIEWER OR BUILD_MAP_EDITOR OR BUILD_ZETAGLEST) MESSAGE(STATUS "Building ZetaGlest shared library...") @@ -453,6 +454,7 @@ IF(BUILD_MODEL_VIEWER OR BUILD_MAP_EDITOR OR BUILD_ZETAGLEST) IF(NOT WIN32) ADD_LIBRARY(${TARGET_NAME} STATIC ${ZG_SOURCE_FILES} ${ZG_INCLUDE_FILES}) + set_target_properties(libzetaglest PROPERTIES PREFIX "") #MESSAGE(STATUS "Building shared game library as a STATIC library and saving to [${LIBRARY_OUTPUT_PATH}]") ELSE() SET(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/data/glest_game) From ff26f9f3bf478e13ac00780b7ae8662e6b940931 Mon Sep 17 00:00:00 2001 From: andy5995 Date: Sat, 6 Oct 2018 23:48:38 -0500 Subject: [PATCH 2/2] remove whitespace --- source/shared_lib/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt index 4c3e7e3ad..00ff1638c 100644 --- a/source/shared_lib/CMakeLists.txt +++ b/source/shared_lib/CMakeLists.txt @@ -48,7 +48,6 @@ ENDIF() SET(EXTERNAL_LIBS "") SET(TARGET_NAME "libzetaglest") - IF(BUILD_MODEL_VIEWER OR BUILD_MAP_EDITOR OR BUILD_ZETAGLEST) MESSAGE(STATUS "Building ZetaGlest shared library...")