From dec899a52438241a77671fb36067e394f8810929 Mon Sep 17 00:00:00 2001 From: mathusummut Date: Wed, 7 Nov 2018 07:36:08 +0100 Subject: [PATCH] Updated CMake files --- source/glest_game/CMakeLists.txt | 1 - source/shared_lib/CMakeLists.txt | 2 -- source/tools/merge_new_language_vars/merge_new_language_vars.pl | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt index 8f123ef78..37819a981 100644 --- a/source/glest_game/CMakeLists.txt +++ b/source/glest_game/CMakeLists.txt @@ -197,7 +197,6 @@ IF(BUILD_ZETAGLEST) #INCLUDE_DIRECTORIES( ${GLEST_LIB_INCLUDE_ROOT}platform/${SDL_VERSION_SNAME} ) IF(WIN32) - INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/include) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/shared_lib/include/platform/posix) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/shared_lib/include/platform/win32) INCLUDE_DIRECTORIES( ${GLEST_LIB_INCLUDE_ROOT}platform/${SDL_VERSION_SNAME} ) diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt index f3a7b71ad..7160de59e 100644 --- a/source/shared_lib/CMakeLists.txt +++ b/source/shared_lib/CMakeLists.txt @@ -289,7 +289,6 @@ IF(BUILD_MODEL_VIEWER OR BUILD_MAP_EDITOR OR BUILD_ZETAGLEST) SET(DIRS_WITH_SRC ${DIRS_WITH_SRC} platform/macosx) ELSEIF(WIN32) SET(DIRS_WITH_SRC ${DIRS_WITH_SRC} platform/win32) - SET(DIRS_WITH_SRC ${DIRS_WITH_SRC} ${PROJECT_SOURCE_DIR}/source/win32_deps/src) ELSE() SET(DIRS_WITH_SRC ${DIRS_WITH_SRC} platform/${SDL_VERSION_SNAME}) SET(DIRS_WITH_SRC ${DIRS_WITH_SRC} platform/posix) @@ -312,7 +311,6 @@ IF(BUILD_MODEL_VIEWER OR BUILD_MAP_EDITOR OR BUILD_ZETAGLEST) SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/${SDL_VERSION_SNAME}/thread.cpp) SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/${SDL_VERSION_SNAME}/window.cpp) SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/${SDL_VERSION_SNAME}/window_gl.cpp) - SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/win32_deps/src/glprocs.c) ENDIF() FOREACH(DIR IN LISTS DIRS_WITH_SRC) diff --git a/source/tools/merge_new_language_vars/merge_new_language_vars.pl b/source/tools/merge_new_language_vars/merge_new_language_vars.pl index fbfc0abe7..c3bbb9f8d 100755 --- a/source/tools/merge_new_language_vars/merge_new_language_vars.pl +++ b/source/tools/merge_new_language_vars/merge_new_language_vars.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -w -# utility for megaglest, probably works for glest and GAE too +# utility for zetaglest, probably works for glest and GAE too # merge new language variables from the main language (english) to all other language files # Copyright 2011 olaus, 20101222 # license: GPL v3