From 22e67f66fae5ca2d476f77d42b4cb1ea0ef1321e Mon Sep 17 00:00:00 2001 From: "Marco Antonio J. Costa" Date: Sun, 5 Jan 2025 07:42:07 -0300 Subject: [PATCH] Move wine.cpp into its own library avoid extra compilations that way --- CMakeLists.txt | 2 ++ Utils/CMakeLists.txt | 1 - wine/CMakeLists.txt | 4 ++++ {Utils => wine/include}/wine.h | 0 {Utils => wine}/wine.cpp | 0 5 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 wine/CMakeLists.txt rename {Utils => wine/include}/wine.h (100%) rename {Utils => wine}/wine.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 05825100..5cbfd1fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,6 +69,7 @@ add_subdirectory("ext/export/src") # static libraries whose translation units don't rely on Application preprocessor definitions. add_subdirectory(lua) add_subdirectory(Multiplayer) +add_subdirectory(wine) set(Ja2_Libraries "${CMAKE_SOURCE_DIR}/binkw32.lib" @@ -82,6 +83,7 @@ set(Ja2_Libraries bfVFS Lua Multiplayer +wine ) # static libraries whose translation units rely on Application preprocessor definitions. diff --git a/Utils/CMakeLists.txt b/Utils/CMakeLists.txt index 05262392..537e2335 100644 --- a/Utils/CMakeLists.txt +++ b/Utils/CMakeLists.txt @@ -29,7 +29,6 @@ set(UtilsSrc "${CMAKE_CURRENT_SOURCE_DIR}/Text Utils.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/Timer Control.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/Utilities.cpp" -"${CMAKE_CURRENT_SOURCE_DIR}/wine.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/WordWrap.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/XMLProperties.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/XMLWriter.cpp" diff --git a/wine/CMakeLists.txt b/wine/CMakeLists.txt new file mode 100644 index 00000000..6206a988 --- /dev/null +++ b/wine/CMakeLists.txt @@ -0,0 +1,4 @@ +add_library(wine + wine.cpp +) +target_include_directories(wine PUBLIC include) diff --git a/Utils/wine.h b/wine/include/wine.h similarity index 100% rename from Utils/wine.h rename to wine/include/wine.h diff --git a/Utils/wine.cpp b/wine/wine.cpp similarity index 100% rename from Utils/wine.cpp rename to wine/wine.cpp