Skip to content

Commit a7f6f05

Browse files
authored
[CMAKE] Make W3DView only depend on WWVegas (#691)
1 parent 72afa6b commit a7f6f05

File tree

4 files changed

+31
-3
lines changed

4 files changed

+31
-3
lines changed

Core/Libraries/Source/WWVegas/WWStub/wwallocstub.cpp

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,23 @@ void operator delete[](void * p, const char *, int)
6363
}
6464

6565
#endif
66+
67+
void* createW3DMemPool(const char *poolName, int allocationSize)
68+
{
69+
return NULL;
70+
}
71+
72+
void* allocateFromW3DMemPool(void* pool, int allocationSize)
73+
{
74+
return malloc(allocationSize);
75+
}
76+
77+
void* allocateFromW3DMemPool(void* pool, int allocationSize, const char* msg, int unused)
78+
{
79+
return malloc(allocationSize);
80+
}
81+
82+
void freeFromW3DMemPool(void* pool, void* p)
83+
{
84+
free(p);
85+
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ add_library(z_wwvegas INTERFACE)
3434
target_include_directories(z_wwvegas INTERFACE
3535
.
3636
WW3D2
37+
WWAudio
3738
WWDownload
3839
Wwutil
3940
)

GeneralsMD/Code/Tools/W3DView/CMakeLists.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,14 +171,20 @@ add_executable(z_w3dview WIN32)
171171
target_sources(z_w3dview PRIVATE ${W3DVIEW_SRC})
172172

173173
target_link_libraries(z_w3dview PRIVATE
174+
core_config
175+
core_utility
176+
core_wwstub # avoid linking GameEngine
177+
d3d8
178+
d3d8lib
179+
d3dx8
174180
dbghelplib
175181
imm32
182+
milesstub
176183
Version
177184
vfw32
178185
winmm
179186
z_wwaudio
180-
z_wwcommon
181-
z_gameenginedevice
187+
z_wwvegas
182188
)
183189

184190
if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")

GeneralsMD/Code/Tools/wdump/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@ set_target_properties(z_wdump PROPERTIES OUTPUT_NAME wdump)
1818
target_sources(z_wdump PRIVATE ${WDUMP_SRC})
1919

2020
target_link_libraries(z_wdump PRIVATE
21+
core_config
22+
core_wwstub # avoid linking GameEngine
2123
dbghelplib
2224
imm32
2325
vfw32
2426
winmm
25-
core_wwstub # avoid linking GameEngine
2627
z_wwvegas
2728
)
2829

0 commit comments

Comments
 (0)