Skip to content

Commit bf71daf

Browse files
committed
[CORE] Move WWDownload library files to Core (#785)
1 parent cdd8d64 commit bf71daf

File tree

26 files changed

+25
-2953
lines changed

26 files changed

+25
-2953
lines changed

Core/Libraries/Source/WWVegas/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ add_subdirectory(WWMath)
3030
add_subdirectory(WWSaveLoad)
3131
add_subdirectory(WWStub)
3232
# add_subdirectory(WW3D2)
33-
# add_subdirectory(WWDownload)
33+
add_subdirectory(WWDownload)
3434
# add_subdirectory(wwshade)
3535

3636
# Helpful interface to bundle the ww modules together.
@@ -40,7 +40,7 @@ target_include_directories(core_wwvegas INTERFACE
4040
.
4141
#WW3D2
4242
WWDebug
43-
#WWDownload
43+
WWDownload
4444
WWLib
4545
WWMath
4646
WWSaveLoad
@@ -54,6 +54,5 @@ target_link_libraries(core_wwvegas INTERFACE
5454
core_wwlib
5555
core_wwmath
5656
core_wwsaveload
57-
# core_wwshade
5857
# core_wwutil
5958
)
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
set(WWDOWNLOAD_SRC
2+
Download.cpp
3+
Download.h
4+
DownloadDebug.h
5+
downloaddefs.h
6+
FTP.CPP
7+
ftp.h
8+
ftpdefs.h
9+
registry.cpp
10+
Registry.h
11+
urlBuilder.cpp
12+
urlBuilder.h
13+
)
14+
15+
add_library(corei_wwdownload INTERFACE)
16+
17+
target_sources(corei_wwdownload INTERFACE ${WWDOWNLOAD_SRC})
18+
19+
target_link_libraries(corei_wwdownload INTERFACE
20+
core_wwcommon
21+
)
Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,8 @@
1-
# Set source files
2-
set(WWDOWNLOAD_SRC
3-
Download.cpp
4-
Download.h
5-
DownloadDebug.h
6-
downloaddefs.h
7-
FTP.CPP
8-
ftp.h
9-
ftpdefs.h
10-
registry.cpp
11-
Registry.h
12-
urlBuilder.cpp
13-
urlBuilder.h
14-
)
15-
16-
# Targets to build.
171
add_library(g_wwdownload STATIC)
182
set_target_properties(g_wwdownload PROPERTIES OUTPUT_NAME wwdownload)
193

20-
target_sources(g_wwdownload PRIVATE ${WWDOWNLOAD_SRC})
21-
224
target_link_libraries(g_wwdownload PRIVATE
23-
g_wwcommon
5+
corei_wwdownload
246
gi_always
257
gi_gameengine_include
268
)

0 commit comments

Comments
 (0)