From e0400761b9072739137f65957118af8513d87b88 Mon Sep 17 00:00:00 2001 From: Roy Shapiro <70241434+RoyShapiro@users.noreply.github.com> Date: Fri, 8 Jul 2022 23:26:49 +0300 Subject: [PATCH] HL:Invasion Update CMakeLists to Upstream --- cl_dll/CMakeLists.txt | 10 ++-------- dlls/CMakeLists.txt | 18 ------------------ 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/cl_dll/CMakeLists.txt b/cl_dll/CMakeLists.txt index 4a5da0d5..c14466aa 100644 --- a/cl_dll/CMakeLists.txt +++ b/cl_dll/CMakeLists.txt @@ -27,13 +27,7 @@ project (CLDLL) set (CLDLL_LIBRARY client) -include(CheckIncludeFile) -check_include_file("tgmath.h" HAVE_TGMATH_H) -if(HAVE_TGMATH_H) - add_definitions(-DHAVE_TGMATH_H) -endif() - -add_definitions(-DCLIENT_WEAPONS -DCLIENT_DLL) +add_definitions(-DCLIENT_DLL) if(NOT MSVC) add_compile_options(-fno-exceptions) # GCC/Clang flag @@ -211,7 +205,7 @@ endif() set_target_properties (${CLDLL_LIBRARY} PROPERTIES POSITION_INDEPENDENT_CODE 1) -if(APPLE OR WIN32 OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux") +if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Android") set(CLDLL_NAME "client") set_target_properties(${CLDLL_LIBRARY} PROPERTIES OUTPUT_NAME ${CLDLL_NAME} diff --git a/dlls/CMakeLists.txt b/dlls/CMakeLists.txt index c7ebef84..2e4f8e2e 100644 --- a/dlls/CMakeLists.txt +++ b/dlls/CMakeLists.txt @@ -27,14 +27,6 @@ project (SVDLL) set (SVDLL_LIBRARY server) -include(CheckIncludeFile) -check_include_file("tgmath.h" HAVE_TGMATH_H) -if(HAVE_TGMATH_H) - add_definitions(-DHAVE_TGMATH_H) -endif() - -add_definitions(-DCLIENT_WEAPONS) - if(NOT MSVC) add_compile_options(-fno-exceptions) # GCC/Clang flag add_compile_options(-Wno-invalid-offsetof) # GCC/Clang flag @@ -45,16 +37,6 @@ else() add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE) endif() -if (USE_VGUI) - add_definitions(-DUSE_VGUI) - if (USE_NOVGUI_MOTD) - add_definitions(-DUSE_NOVGUI_MOTD) - endif() - if (USE_NOVGUI_SCOREBOARD) - add_definitions(-DUSE_NOVGUI_SCOREBOARD) - endif() -endif() - if (USE_GSTREAMER AND (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")) add_definitions(-DUSE_GSTREAMER) endif()