Skip to content

Commit d5ce13c

Browse files
committed
Add precompiled header for WW3D2
1 parent 611fb68 commit d5ce13c

File tree

4 files changed

+30
-2
lines changed

4 files changed

+30
-2
lines changed

Generals/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,20 @@ set_target_properties(g_ww3d2 PROPERTIES OUTPUT_NAME ww3d2)
233233

234234
target_sources(g_ww3d2 PRIVATE ${WW3D2_SRC})
235235

236+
target_compile_definitions(g_ww3d2 PRIVATE
237+
$<$<BOOL:${IS_VS6_BUILD}>:WINVER=0x0500>
238+
)
239+
240+
target_precompile_headers(g_ww3d2 PRIVATE
241+
[["always.h"]]
242+
dx8wrapper.h
243+
[["STLUtils.h"]]
244+
[["win.h"]]
245+
<windows.h>
246+
[["WWCommon.h"]]
247+
[["wwstring.h"]]
248+
)
249+
236250
target_link_libraries(g_ww3d2 PRIVATE
237251
corei_ww3d2
238252
g_wwcommon

Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
//#define CREATE_DX8_FPU_PRESERVE
4242
#define WW3D_DEVTYPE D3DDEVTYPE_HAL
4343

44-
#if defined(_MSC_VER) && _MSC_VER < 1300
44+
#if !defined(WINVER) || WINVER < 0x0500
4545
#undef WINVER
4646
#define WINVER 0x0500 // Required to access GetMonitorInfo in VC6.
4747
#endif

GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,20 @@ set_target_properties(z_ww3d2 PROPERTIES OUTPUT_NAME ww3d2)
238238

239239
target_sources(z_ww3d2 PRIVATE ${WW3D2_SRC})
240240

241+
target_compile_definitions(z_ww3d2 PRIVATE
242+
$<$<BOOL:${IS_VS6_BUILD}>:WINVER=0x0500>
243+
)
244+
245+
target_precompile_headers(z_ww3d2 PRIVATE
246+
[["always.h"]]
247+
dx8wrapper.h
248+
[["STLUtils.h"]]
249+
[["win.h"]]
250+
<windows.h>
251+
[["WWCommon.h"]]
252+
[["wwstring.h"]]
253+
)
254+
241255
target_link_libraries(z_ww3d2 PRIVATE
242256
corei_ww3d2
243257
z_wwcommon

GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
//#define CREATE_DX8_FPU_PRESERVE
4646
#define WW3D_DEVTYPE D3DDEVTYPE_HAL
4747

48-
#if defined(_MSC_VER) && _MSC_VER < 1300
48+
#if !defined(WINVER) || WINVER < 0x0500
4949
#undef WINVER
5050
#define WINVER 0x0500 // Required to access GetMonitorInfo in VC6.
5151
#endif

0 commit comments

Comments
 (0)