mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
Rename 'Standard Gaming Platform' to 'sgp' (#246)
* rename 'Standard Gaming Platform' to 'sgp' * Adapt CMakeLists.txt files to renamed SGP directory * Lowercase it
This commit is contained in:
+10
-18
@@ -23,7 +23,7 @@ set(usingMsBuild $<STREQUAL:${CMAKE_VS_PLATFORM_NAME},Win32>)
|
|||||||
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
|
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
|
||||||
|
|
||||||
add_compile_definitions(CINTERFACE XML_STATIC VFS_STATIC VFS_WITH_SLF VFS_WITH_7ZIP _CRT_SECURE_NO_DEPRECATE)
|
add_compile_definitions(CINTERFACE XML_STATIC VFS_STATIC VFS_WITH_SLF VFS_WITH_7ZIP _CRT_SECURE_NO_DEPRECATE)
|
||||||
include_directories(${CMAKE_SOURCE_DIR} "ext/VFS/include" Utils TileEngine TacticalAI ModularizedTacticalAI Tactical Strategic "Standard Gaming Platform" Res Lua Laptop Multiplayer "Multiplayer/raknet" Editor Console)
|
include_directories(${CMAKE_SOURCE_DIR} "ext/VFS/include" Utils TileEngine TacticalAI ModularizedTacticalAI Tactical Strategic sgp Res Lua Laptop Multiplayer "Multiplayer/raknet" Editor Console)
|
||||||
|
|
||||||
# external libraries
|
# external libraries
|
||||||
add_subdirectory("ext/libpng")
|
add_subdirectory("ext/libpng")
|
||||||
@@ -42,29 +42,21 @@ add_subdirectory(Lua)
|
|||||||
# static libraries whose source files, header files or header files included
|
# static libraries whose source files, header files or header files included
|
||||||
# by header files rely on Application and Language preprocessor definitions, and
|
# by header files rely on Application and Language preprocessor definitions, and
|
||||||
# therefore need to be compiled multiple times. Very Bad.
|
# therefore need to be compiled multiple times. Very Bad.
|
||||||
add_subdirectory(TileEngine)
|
|
||||||
add_subdirectory(TacticalAI)
|
|
||||||
add_subdirectory(Utils)
|
|
||||||
add_subdirectory(Strategic)
|
|
||||||
add_subdirectory("Standard Gaming Platform")
|
|
||||||
add_subdirectory(Laptop)
|
|
||||||
add_subdirectory(Editor)
|
|
||||||
add_subdirectory(Console)
|
|
||||||
add_subdirectory(Tactical)
|
|
||||||
add_subdirectory(ModularizedTacticalAI)
|
|
||||||
# TODO: Rename 'Standard Gaming Platform' directory to 'SGP' so this can be refactored away
|
|
||||||
set(Ja2_Libs
|
set(Ja2_Libs
|
||||||
TileEngine
|
TileEngine
|
||||||
TacticalAI
|
TacticalAI
|
||||||
Utils
|
Utils
|
||||||
Strategic
|
Strategic
|
||||||
SGP
|
sgp
|
||||||
Laptop
|
Laptop
|
||||||
Editor
|
Editor
|
||||||
Console
|
Console
|
||||||
Tactical
|
Tactical
|
||||||
ModularizedTacticalAI
|
ModularizedTacticalAI
|
||||||
)
|
)
|
||||||
|
foreach(lib IN LISTS Ja2_Libs)
|
||||||
|
add_subdirectory(${lib})
|
||||||
|
endforeach()
|
||||||
|
|
||||||
# TODO: Move these units into their own directory to declutter the root dir and CMakeLists.txt file
|
# TODO: Move these units into their own directory to declutter the root dir and CMakeLists.txt file
|
||||||
set(Ja2Src
|
set(Ja2Src
|
||||||
@@ -160,7 +152,7 @@ foreach(lang IN LISTS LangTargets)
|
|||||||
set(isUb $<STREQUAL:${exe},JA2UB>)
|
set(isUb $<STREQUAL:${exe},JA2UB>)
|
||||||
set(isUbEditor $<STREQUAL:${exe},JA2UBMAPEDITOR>)
|
set(isUbEditor $<STREQUAL:${exe},JA2UBMAPEDITOR>)
|
||||||
|
|
||||||
# static library for an app/lang combination, e.g. JA2_ENGLISH_SGP.lib
|
# static library for an app/lang combination, e.g. JA2_ENGLISH_sgp.lib
|
||||||
add_library(${VeryBadLib})
|
add_library(${VeryBadLib})
|
||||||
target_sources(${VeryBadLib} PRIVATE ${${lib}Src})
|
target_sources(${VeryBadLib} PRIVATE ${${lib}Src})
|
||||||
|
|
||||||
@@ -174,9 +166,9 @@ foreach(lang IN LISTS LangTargets)
|
|||||||
target_link_libraries(${Executable} PUBLIC ${VeryBadLib})
|
target_link_libraries(${Executable} PUBLIC ${VeryBadLib})
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
# for SGP only
|
# for sgp only
|
||||||
target_link_libraries(${Executable}_SGP PRIVATE "ddraw.lib" "${PROJECT_SOURCE_DIR}/fmodvc.lib")
|
target_link_libraries(${Executable}_sgp PRIVATE "ddraw.lib" "${PROJECT_SOURCE_DIR}/fmodvc.lib")
|
||||||
target_link_libraries(${Executable}_SGP PUBLIC libpng)
|
target_link_libraries(${Executable}_sgp PUBLIC libpng)
|
||||||
target_compile_definitions(${Executable}_SGP PRIVATE NO_ZLIB_COMPRESSION)
|
target_compile_definitions(${Executable}_sgp PRIVATE NO_ZLIB_COMPRESSION)
|
||||||
endforeach()
|
endforeach()
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
set(SGPSrc
|
set(sgpSrc
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/Button Sound Control.cpp"
|
"${CMAKE_CURRENT_SOURCE_DIR}/Button Sound Control.cpp"
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/Button System.cpp"
|
"${CMAKE_CURRENT_SOURCE_DIR}/Button System.cpp"
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/Compression.cpp"
|
"${CMAKE_CURRENT_SOURCE_DIR}/Compression.cpp"
|
||||||
Reference in New Issue
Block a user