Skip to content

[GEN][ZH] Remove unnecessary {g,z}i_libraries_source #624

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

Merged
merged 1 commit into from
Apr 8, 2025
Merged

[GEN][ZH] Remove unnecessary {g,z}i_libraries_source #624

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
2 changes: 0 additions & 2 deletions Generals/Code/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ 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 INTERFACE)
add_library(gi_libraries_source_wwvegas INTERFACE)
add_library(gi_libraries_source_wwvegas_ww3d2 INTERFACE)
add_library(gi_libraries_source_wwvegas_wwdebug INTERFACE)
Expand All @@ -16,7 +15,6 @@ 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 INTERFACE "Libraries/Source")
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_wwdebug INTERFACE "Libraries/Source/WWVegas/WWDebug")
Expand Down
1 change: 0 additions & 1 deletion Generals/Code/GameEngine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1084,7 +1084,6 @@ target_include_directories(g_gameengine PRIVATE

target_link_libraries(g_gameengine PRIVATE
gi_libraries_include
gi_libraries_source
)

target_link_libraries(g_gameengine PUBLIC
Expand Down
1 change: 0 additions & 1 deletion Generals/Code/GameEngineDevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,6 @@ target_include_directories(g_gameenginedevice PUBLIC

target_link_libraries(g_gameenginedevice PRIVATE
gi_libraries_include
gi_libraries_source
gi_main
)

Expand Down
1 change: 0 additions & 1 deletion Generals/Code/Main/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ target_link_libraries(g_generals PRIVATE
g_gameengine
g_gameenginedevice
gi_libraries_include
gi_libraries_source
imm32
milesstub
safedisc
Expand Down
1 change: 0 additions & 1 deletion Generals/Code/Tools/Compress/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ target_sources(g_compress PRIVATE ${COMRPESS_SRC})
target_link_libraries(g_compress PRIVATE
g_compression
gi_libraries_include
gi_libraries_source
gz_config
)

Expand Down
2 changes: 1 addition & 1 deletion Generals/Code/Tools/Compress/Compress.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <string>
#include <cstdio>
#include "Lib/BaseType.h"
#include "Compression/Compression.h"
#include "Compression.h"
#include "../CRCDiff/debug.h"

#ifndef DEBUG
Expand Down
2 changes: 0 additions & 2 deletions GeneralsMD/Code/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ 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 INTERFACE)
add_library(zi_libraries_source_wwvegas INTERFACE)
add_library(zi_libraries_source_wwvegas_ww3d2 INTERFACE)
add_library(zi_libraries_source_wwvegas_wwdebug INTERFACE)
Expand All @@ -16,7 +15,6 @@ 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 INTERFACE "Libraries/Source")
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_wwdebug INTERFACE "Libraries/Source/WWVegas/WWDebug")
Expand Down
1 change: 0 additions & 1 deletion GeneralsMD/Code/GameEngine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1167,7 +1167,6 @@ target_include_directories(z_gameengine PRIVATE

target_link_libraries(z_gameengine PRIVATE
zi_libraries_include
zi_libraries_source
)

target_link_libraries(z_gameengine PUBLIC
Expand Down
1 change: 0 additions & 1 deletion GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,6 @@ target_include_directories(z_gameenginedevice PUBLIC

target_link_libraries(z_gameenginedevice PRIVATE
zi_libraries_include
zi_libraries_source
zi_main
)

Expand Down
1 change: 0 additions & 1 deletion GeneralsMD/Code/Main/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ target_link_libraries(z_generals PRIVATE
z_gameenginedevice
z_profile
zi_libraries_include
zi_libraries_source
)

# TODO Originally referred to build host and user, replace with git info perhaps?
Expand Down
1 change: 0 additions & 1 deletion GeneralsMD/Code/Tools/Compress/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ target_link_libraries(z_compress PRIVATE
gz_config
z_compression
zi_libraries_include
zi_libraries_source
)

if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/Tools/Compress/Compress.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <string>
#include <cstdio>
#include "Lib/BaseType.h"
#include "Compression/Compression.h"
#include "Compression.h"
#include "../CRCDiff/debug.h"

#ifndef DEBUG
Expand Down