Rename ddio_common to ddio

CMakeLists.txt

@@ -180,7 +180,7 @@ else()
   add_subdirectory(linux)
 endif()
 
-add_subdirectory(ddio_common)
+add_subdirectory(ddio)
 add_subdirectory(dd_video)
 add_subdirectory(fix)
 add_subdirectory(manage)

Descent3/CMakeLists.txt

@@ -297,7 +297,7 @@ add_executable(Descent3
   ${HEADERS} ${CPPS} ${PLATFORM_CPPS} ${INCS}
 )
 target_link_libraries(Descent3
-  2dlib AudioEncode bitmap cfile czip d3music dd_video ddebug ddio_common libmve libacm
+  2dlib AudioEncode bitmap cfile czip d3music dd_video ddebug ddio libmve libacm
   fix grtext manage mem misc model module movie stream_audio
   music networking physics renderer rtperformance sndlib ui unzip vecmat md5
   ${PLATFORM_LIBS})

bitmap/CMakeLists.txt

@@ -14,9 +14,11 @@ add_library(bitmap STATIC ${HEADERS} ${CPPS})
 target_link_libraries(bitmap PRIVATE
   cfile
   ddebug
+  ddio
   stb
 )
-target_include_directories(bitmap PUBLIC .)
-target_link_libraries(bitmap PRIVATE
-  ddio_common
+target_include_directories(bitmap PUBLIC
+  $<BUILD_INTERFACE:
+    ${PROJECT_SOURCE_DIR}/bitmap
+  >
 )

cfile/CMakeLists.txt

@@ -6,7 +6,7 @@ set(CPPS
 
 add_library(cfile STATIC ${CPPS})
 target_link_libraries(cfile PRIVATE
-  ddio_common
+  ddio
 )
 target_include_directories(cfile PUBLIC
   $<BUILD_INTERFACE:

ddio/CMakeLists.txt

@@ -23,12 +23,12 @@ set(CPPS
     wintimer.cpp
   >
 )
-add_library(ddio_common STATIC ${CPPS})
-target_link_libraries(ddio_common
+add_library(ddio STATIC ${CPPS})
+target_link_libraries(ddio
   ddebug
 )
-target_include_directories(ddio_common PUBLIC
+target_include_directories(ddio PUBLIC
   $<BUILD_INTERFACE:
-  ${PROJECT_SOURCE_DIR}/ddio_common
+  ${PROJECT_SOURCE_DIR}/ddio
   >
 )

grtext/CMakeLists.txt

@@ -6,5 +6,5 @@ set(CPPS
 
 add_library(grtext STATIC ${HEADERS} ${CPPS})
 target_link_libraries(grtext PRIVATE
-  ddio_common
+  ddio
 )

linux/CMakeLists.txt

@@ -18,5 +18,5 @@ target_include_directories(linux PUBLIC
   >
 )
 target_link_libraries(linux PRIVATE
-  ddio_common
+  ddio
 )

manage/CMakeLists.txt

@@ -24,7 +24,7 @@ set(CPPS
 add_library(manage STATIC ${HEADERS} ${CPPS})
 target_link_libraries(manage PRIVATE
   cfile
-  ddio_common
+  ddio
   sndlib
   stream_audio
 )

model/CMakeLists.txt

@@ -5,5 +5,5 @@ set(CPPS
 
 add_library(model STATIC ${HEADERS} ${CPPS})
 target_link_libraries(model PRIVATE
-  ddio_common
+  ddio
 )

module/CMakeLists.txt

@@ -4,5 +4,5 @@ set(CPPS
 
 add_library(module STATIC ${HEADERS} ${CPPS})
 target_link_libraries(module PRIVATE
-  ddio_common
+  ddio
 )

movie/CMakeLists.txt

@@ -4,6 +4,6 @@ set(CPPS
 
 add_library(movie STATIC ${HEADERS} ${CPPS})
 target_link_libraries(movie PRIVATE
-  ddio_common
+  ddio
   libmve
 )

music/CMakeLists.txt

@@ -8,7 +8,7 @@ set(CPPS
 add_library(music STATIC ${HEADERS} ${CPPS})
 target_link_libraries(music
   cfile
-  ddio_common
+  ddio
   sndlib
   stream_audio
 )

netcon/lanclient/CMakeLists.txt

@@ -5,7 +5,7 @@ set_target_properties(Direct_TCP_IP PROPERTIES PREFIX "")
 set_target_properties(Direct_TCP_IP PROPERTIES CXX_VISIBILITY_PRESET "hidden")
 set_target_properties(Direct_TCP_IP PROPERTIES OUTPUT_NAME "Direct TCP~IP")
 target_link_libraries(Direct_TCP_IP PRIVATE
-  ddio_common
+  ddio
   inetfile
   $<$<PLATFORM_ID:Windows>:
     ws2_32

networking/CMakeLists.txt

@@ -10,5 +10,5 @@ endif()
 
 add_library(networking STATIC ${HEADERS} ${CPPS} ${PLATFORMCPPS})
 target_link_libraries(networking PRIVATE
-  ddio_common
+  ddio
 )

physics/CMakeLists.txt

@@ -7,6 +7,6 @@ set(CPPS
 
 add_library(physics STATIC ${HEADERS} ${CPPS})
 target_link_libraries(physics PRIVATE
-  ddio_common
+  ddio
   sndlib
 )

renderer/CMakeLists.txt

@@ -26,5 +26,5 @@ endif()
 add_library(renderer STATIC ${HEADERS} ${CPPS})
 target_link_libraries(renderer PRIVATE
   bitmap
-  ddio_common
+  ddio
 )

rtperformance/CMakeLists.txt

@@ -4,5 +4,5 @@ set(CPPS
 
 add_library(rtperformance STATIC ${HEADERS} ${CPPS})
 target_link_libraries(rtperformance PRIVATE
-  ddio_common
+  ddio
 )

sndlib/CMakeLists.txt

@@ -20,7 +20,7 @@ set(CPPS
 add_library(sndlib STATIC ${CPPS})
 target_link_libraries(sndlib PRIVATE
   cfile
-  ddio_common
+  ddio
   stream_audio
 )
 target_include_directories(sndlib PUBLIC

stream_audio/CMakeLists.txt

@@ -5,7 +5,7 @@ set(CPPS
 
 add_library(stream_audio STATIC ${HEADERS} ${CPPS})
 target_link_libraries(stream_audio PRIVATE
-  ddio_common
+  ddio
   libacm
   sndlib
 )

ui/CMakeLists.txt

@@ -18,5 +18,5 @@ set(CPPS
 
 add_library(ui STATIC ${HEADERS} ${CPPS})
 target_link_libraries(ui PRIVATE
-  ddio_common
+  ddio
 )

win32/CMakeLists.txt

@@ -10,5 +10,5 @@ add_library(win32 STATIC ${CPPS})
 add_dependencies(win32 get_git_hash)
 target_include_directories(win32 PRIVATE ${PROJECT_BINARY_DIR}/lib)
 target_link_libraries(win32 PRIVATE
-  ddio_common
+  ddio
 )