Skip to content

[CMAKE] Fix Core GameEngine include directories #974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
xezon wants to merge 1 commit into from
Closed

[CMAKE] Fix Core GameEngine include directories #974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
# c stands for core, i stands for Interface
# i stands for Interface
add_library(corei_gameengine_include INTERFACE)
add_library(corei_gameenginedevice_include INTERFACE)
add_library(corei_libraries_include INTERFACE)
add_library(corei_libraries_source_wwvegas INTERFACE)
add_library(corei_libraries_source_wwvegas_wwdebug INTERFACE)
add_library(corei_libraries_source_wwvegas_wwlib INTERFACE)
add_library(corei_always INTERFACE)

target_include_directories(corei_gameengine_include INTERFACE "GameEngine/Include")
target_include_directories(corei_gameenginedevice_include INTERFACE "GameEngineDevice/Source")
target_include_directories(corei_libraries_include INTERFACE "Libraries/Include")
target_include_directories(corei_libraries_source_wwvegas INTERFACE "Libraries/Source/WWVegas")
target_include_directories(corei_libraries_source_wwvegas_wwdebug INTERFACE "Libraries/Source/WWVegas/WWDebug")
target_include_directories(corei_libraries_source_wwvegas_wwlib INTERFACE "Libraries/Source/WWVegas/WWLib")
target_link_libraries(corei_always INTERFACE
core_utility
Expand Down
1 change: 1 addition & 0 deletions Core/Libraries/Source/WWVegas/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ target_compile_definitions(core_wwcommon INTERFACE
target_link_libraries(core_wwcommon INTERFACE
core_config
core_utility
corei_gameengine_include
d3d8lib
milesstub
stlport
Expand Down
4 changes: 3 additions & 1 deletion Dependencies/Utility/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
add_library(core_utility INTERFACE)

target_include_directories(core_utility INTERFACE ".")
target_include_directories(core_utility INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}
)
8 changes: 0 additions & 8 deletions Generals/Code/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,15 @@
# g stands for Generals, i stands for Interface
add_library(gi_gameengine INTERFACE)
add_library(gi_gameengine_include INTERFACE)
add_library(gi_gameenginedevice_include INTERFACE)
add_library(gi_libraries_include INTERFACE)
add_library(gi_libraries_source_wwvegas INTERFACE)
add_library(gi_libraries_source_wwvegas_ww3d2 INTERFACE)
add_library(gi_libraries_source_wwvegas_wwmath INTERFACE)
add_library(gi_libraries_source_wwvegas_wwsaveload INTERFACE)
add_library(gi_main INTERFACE)
add_library(gi_always INTERFACE)

target_include_directories(gi_gameengine INTERFACE "GameEngine")
target_include_directories(gi_gameengine_include INTERFACE "GameEngine/Include")
target_include_directories(gi_gameenginedevice_include INTERFACE "GameEngineDevice/Source")
target_include_directories(gi_libraries_include INTERFACE "Libraries/Include")
target_include_directories(gi_libraries_source_wwvegas INTERFACE "Libraries/Source/WWVegas")
target_include_directories(gi_libraries_source_wwvegas_ww3d2 INTERFACE "Libraries/Source/WWVegas/WW3D2")
target_include_directories(gi_libraries_source_wwvegas_wwmath INTERFACE "Libraries/Source/WWVegas/WWMath")
target_include_directories(gi_libraries_source_wwvegas_wwsaveload INTERFACE "Libraries/Source/WWVegas/WWSaveLoad")
target_include_directories(gi_main INTERFACE "Main")

target_compile_definitions(gi_always INTERFACE
Expand Down
1 change: 1 addition & 0 deletions Generals/Code/Libraries/Source/WWVegas/WWDownload/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ set_target_properties(g_wwdownload PROPERTIES OUTPUT_NAME wwdownload)

target_link_libraries(g_wwdownload PRIVATE
corei_wwdownload
corei_gameengine_include
gi_always
gi_gameengine_include
)
1 change: 1 addition & 0 deletions Generals/Code/Tools/ParticleEditor/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ target_include_directories(g_particleeditor PRIVATE
target_compile_definitions(g_particleeditor PRIVATE _AFXDLL)

target_link_libraries(g_particleeditor PRIVATE
corei_gameengine_include
corei_libraries_source_wwvegas
corei_libraries_source_wwvegas_wwlib
d3d8lib
Expand Down
1 change: 1 addition & 0 deletions Generals/Code/Tools/W3DView/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ target_link_libraries(g_w3dview PRIVATE
core_config
core_utility
core_wwstub # avoid linking GameEngine
corei_gameengine_include
corei_w3dview # this interface gets the source files for the tool
d3d8
d3d8lib
Expand Down
2 changes: 2 additions & 0 deletions Generals/Code/Tools/WorldBuilder/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,8 @@ target_link_libraries(g_worldbuilder PRIVATE
d3d8lib
dbghelplib
core_browserdispatch
corei_gameengine_include
corei_gameenginedevice_include
g_gameengine
g_gameenginedevice
gi_gameengine_include
Expand Down
8 changes: 0 additions & 8 deletions GeneralsMD/Code/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,15 @@
# z stands for Zero Hour, i stands for Interface
add_library(zi_gameengine INTERFACE)
add_library(zi_gameengine_include INTERFACE)
add_library(zi_gameenginedevice_include INTERFACE)
add_library(zi_libraries_include INTERFACE)
add_library(zi_libraries_source_wwvegas INTERFACE)
add_library(zi_libraries_source_wwvegas_ww3d2 INTERFACE)
add_library(zi_libraries_source_wwvegas_wwmath INTERFACE)
add_library(zi_libraries_source_wwvegas_wwsaveload INTERFACE)
add_library(zi_main INTERFACE)
add_library(zi_always INTERFACE)

target_include_directories(zi_gameengine INTERFACE "GameEngine")
target_include_directories(zi_gameengine_include INTERFACE "GameEngine/Include")
target_include_directories(zi_gameenginedevice_include INTERFACE "GameEngineDevice/Source")
target_include_directories(zi_libraries_include INTERFACE "Libraries/Include")
target_include_directories(zi_libraries_source_wwvegas INTERFACE "Libraries/Source/WWVegas")
target_include_directories(zi_libraries_source_wwvegas_ww3d2 INTERFACE "Libraries/Source/WWVegas/WW3D2")
target_include_directories(zi_libraries_source_wwvegas_wwmath INTERFACE "Libraries/Source/WWVegas/WWMath")
target_include_directories(zi_libraries_source_wwvegas_wwsaveload INTERFACE "Libraries/Source/WWVegas/WWSaveLoad")
target_include_directories(zi_main INTERFACE "Main")

target_compile_definitions(zi_always INTERFACE
Expand Down
1 change: 1 addition & 0 deletions GeneralsMD/Code/Libraries/Source/WWVegas/WWDownload/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ set_target_properties(z_wwdownload PROPERTIES OUTPUT_NAME wwdownload)

target_link_libraries(z_wwdownload PRIVATE
corei_wwdownload
corei_gameengine_include
zi_always
zi_gameengine_include
)
1 change: 1 addition & 0 deletions GeneralsMD/Code/Tools/ParticleEditor/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ target_include_directories(z_particleeditor PRIVATE
target_link_libraries(z_particleeditor PRIVATE
core_debug
core_profile
corei_gameengine_include
corei_libraries_source_wwvegas
corei_libraries_source_wwvegas_wwlib
d3d8lib
Expand Down
1 change: 1 addition & 0 deletions GeneralsMD/Code/Tools/W3DView/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ target_link_libraries(z_w3dview PRIVATE
core_config
core_utility
core_wwstub # avoid linking GameEngine
corei_gameengine_include
corei_w3dview # this interface gets the source files for the tool
d3d8
d3d8lib
Expand Down
2 changes: 2 additions & 0 deletions GeneralsMD/Code/Tools/WorldBuilder/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,8 @@ target_include_directories(z_worldbuilder PRIVATE
target_link_libraries(z_worldbuilder PRIVATE
core_debug
core_profile
corei_gameengine_include
corei_gameenginedevice_include
d3d8lib
dbghelplib
imm32
Expand Down
Loading