Setup project structure for the future (#22)

* Remove empty gothic-userapi includes * refactor: Cleanup, refactor, change Union 1.0 Game_*() functions to individual externals * Remove unused includes from gothic-userapi * Change union-api to shared library, cleanup Logger, replace Union collections with stdlib in NH::Bass, upgrade dependencies * Fix path to Memory.cpp in CMake files
Silver-Ore-Team · May 21, 2024 · 1c4bcbb · 1c4bcbb
1 parent 2b6b383
commit 1c4bcbb
Show file tree

Hide file tree

Showing 666 changed files with 1,208 additions and 4,267 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 3.25)
 set(PROJECT_VERSION "0.1.3")
-project(zBassMusic VERSION ${PROJECT_VERSION})
+set(PROJECT_VERSION_CMAKE "${PROJECT_VERSION}")
+project(zBassMusic VERSION ${PROJECT_VERSION_CMAKE})
 
 option(BUILD_VDF "Build .VDF file with plugin" ON)
 
@@ -20,4 +21,57 @@ include(cmake/union-api.cmake)
 include(cmake/gothic-api.cmake)
 include(cmake/bass.cmake)
 
-add_subdirectory(plugin)
+add_library(plugin SHARED)
+set_target_properties(plugin PROPERTIES
+        OUTPUT_NAME "zBassMusic"
+        RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}"
+        RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}")
+
+string(TIMESTAMP BUILD_TIME "%Y-%m-%dT%H:%M:%S")
+execute_process(COMMAND git symbolic-ref --short HEAD OUTPUT_VARIABLE BUILD_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND git log --format=%H -n 1 OUTPUT_VARIABLE BUILD_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/version.rc.in" "${CMAKE_CURRENT_BINARY_DIR}/version.rc" @ONLY)
+configure_file("${CMAKE_SOURCE_DIR}/vdf/script.vdfs.in" "${CMAKE_BINARY_DIR}/script.vdfs")
+configure_file("${CMAKE_SOURCE_DIR}/src/BuildInfo.h.in" "${CMAKE_BINARY_DIR}/src/BuildInfo.h" @ONLY)
+
+file(GLOB_RECURSE PLUGIN_SOURCES "src/**.cpp" "${UNION_API_DIR}/union-api/Union/Memory.cpp")
+target_sources(plugin PRIVATE ${PLUGIN_SOURCES} "${CMAKE_CURRENT_BINARY_DIR}/version.rc")
+
+add_compile_options(plugin PRIVATE /W4 /WX)
+target_compile_definitions(plugin PRIVATE _UNION_API_DLL __G1 __G1A __G2 __G2A)
+target_include_directories(plugin PRIVATE "src/" "${CMAKE_BINARY_DIR}/src/")
+target_link_libraries(plugin PRIVATE union-api gothic-api bass)
+
+install(FILES $<TARGET_RUNTIME_DLLS:plugin> "${CMAKE_BINARY_DIR}/zBassMusic.dll" TYPE BIN)
+install(FILES $<TARGET_RUNTIME_DLLS:plugin> "${CMAKE_BINARY_DIR}/UnionAPI.dll" TYPE BIN)
+if(${BUILD_VDF})
+    install(FILES "${CMAKE_BINARY_DIR}/script.vdfs" DESTINATION "${CMAKE_INSTALL_PREFIX}")
+    install(SCRIPT "${VDF_DIR}/vdf.cmake")
+    install(CODE "execute_process(COMMAND ${CMAKE_SOURCE_DIR}/vdf/GothicVDFS.exe /B \"${CMAKE_INSTALL_PREFIX}/script.vdfs\"
+            WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}\")")
+endif()
+
+if(${BUILD_VDF})
+    string(REPLACE "build" "install" INSTALL_DIR "${CMAKE_BINARY_DIR}")
+    add_custom_target(plugin_vdf ALL
+            COMMAND ${CMAKE_COMMAND} --install ${CMAKE_BINARY_DIR} --prefix ${INSTALL_DIR}
+            DEPENDS plugin
+            COMMENT "Run install to build VDF")
+
+    if(DEFINED ENV{COPY_VDF_TARGET})
+        add_custom_target(copy_vdf ALL
+                COMMAND ${CMAKE_COMMAND} -E copy "${INSTALL_DIR}/zBassMusic.vdf" "$ENV{COPY_VDF_TARGET}"
+                DEPENDS plugin_vdf
+                COMMENT "Copy plugin to target directory: $ENV{COPY_VDF_TARGET}")
+    endif()
+endif()
+
+if(DEFINED ENV{COPY_DLL_TARGET})
+    add_custom_target(copy_dll ALL
+            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/zBassMusic.dll" "$ENV{COPY_DLL_TARGET}/Autorun/zBassMusic.dll"
+            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/UnionAPI.dll" "$ENV{COPY_DLL_TARGET}/Autorun/UnionAPI.dll"
+            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/dependencies/bass/lib/bass.dll" "$ENV{COPY_DLL_TARGET}/bass.dll"
+            DEPENDS plugin
+            COMMENT "Copy plugin to target directory: $ENV{COPY_DLL_TARGET}")
+endif()
diff --git a/cmake/union-api.cmake b/cmake/union-api.cmake
@@ -1,4 +1,4 @@
-add_library(union-api STATIC)
+add_library(union-api SHARED)
 set_target_properties(union-api PROPERTIES
         OUTPUT_NAME "UnionAPI"
         LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
@@ -8,13 +8,13 @@ set_target_properties(union-api PROPERTIES
 target_include_directories(union-api PUBLIC "${UNION_API_DIR}/union-api")
 target_link_directories(union-api PUBLIC "${UNION_API_DIR}/union-api")
 
-file(GLOB_RECURSE UNION_SOURCES "${UNION_API_DIR}/union-api/**.cpp")
+file(GLOB_RECURSE UNION_SOURCES "${UNION_API_DIR}/union-api/union-api.cpp" "${UNION_API_DIR}/union-api/Union/Memory.cpp")
 target_sources(union-api PRIVATE ${UNION_SOURCES})
 
 if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
-    target_compile_definitions(union-api PUBLIC WIN32 _DEBUG _CONSOLE _UNION_API_LIB PRIVATE _UNION_API_BUILD)
+    target_compile_definitions(union-api PUBLIC WIN32 _DEBUG _CONSOLE _UNION_API_DLL PRIVATE _UNION_API_BUILD)
 elseif("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
-    target_compile_definitions(union-api PUBLIC WIN32 NDEBUG _CONSOLE _UNION_API_LIB PRIVATE _UNION_API_BUILD)
+    target_compile_definitions(union-api PUBLIC WIN32 NDEBUG _CONSOLE _UNION_API_DLL PRIVATE _UNION_API_BUILD)
 else()
     message(FATAL_ERROR "Invalid $CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} not in range [Debug, Release]")
 endif()
diff --git a/docs/options.md b/docs/options.md
@@ -1,4 +1,4 @@
-# Options reference (.ini)
+# OptionsType reference (.ini)
 ```ini
 [BASSMUSIC]
 

diff --git a/gothic-userapi/.gitkeep b/gothic-userapi/.gitkeep
diff --git a/gothic-userapi/CGameManager.inl b/gothic-userapi/CGameManager.inl
diff --git a/gothic-userapi/TMobOptPos.inl b/gothic-userapi/TMobOptPos.inl
diff --git a/gothic-userapi/TNpcAIState.inl b/gothic-userapi/TNpcAIState.inl
diff --git a/gothic-userapi/TNpcPerc.inl b/gothic-userapi/TNpcPerc.inl
diff --git a/gothic-userapi/TNpcSlot.inl b/gothic-userapi/TNpcSlot.inl
diff --git a/gothic-userapi/oCAIArrow.inl b/gothic-userapi/oCAIArrow.inl
diff --git a/gothic-userapi/oCAIArrowBase.inl b/gothic-userapi/oCAIArrowBase.inl
diff --git a/gothic-userapi/oCAICamera.inl b/gothic-userapi/oCAICamera.inl
diff --git a/gothic-userapi/oCAIDrop.inl b/gothic-userapi/oCAIDrop.inl
diff --git a/gothic-userapi/oCAIHuman.inl b/gothic-userapi/oCAIHuman.inl
diff --git a/gothic-userapi/oCAIHuman_Stand.inl b/gothic-userapi/oCAIHuman_Stand.inl
diff --git a/gothic-userapi/oCAISound.inl b/gothic-userapi/oCAISound.inl
diff --git a/gothic-userapi/oCAIVobMove.inl b/gothic-userapi/oCAIVobMove.inl
diff --git a/gothic-userapi/oCAIVobMoveTorch.inl b/gothic-userapi/oCAIVobMoveTorch.inl
diff --git a/gothic-userapi/oCAniCtrl_Human.inl b/gothic-userapi/oCAniCtrl_Human.inl
diff --git a/gothic-userapi/oCAniCtrl_Human_oTComboInfo.inl b/gothic-userapi/oCAniCtrl_Human_oTComboInfo.inl
diff --git a/gothic-userapi/oCAskBox.inl b/gothic-userapi/oCAskBox.inl
diff --git a/gothic-userapi/oCBarrier.inl b/gothic-userapi/oCBarrier.inl
diff --git a/gothic-userapi/oCBinkPlayer.inl b/gothic-userapi/oCBinkPlayer.inl
diff --git a/gothic-userapi/oCCSManager.inl b/gothic-userapi/oCCSManager.inl
diff --git a/gothic-userapi/oCCSPlayer.inl b/gothic-userapi/oCCSPlayer.inl
diff --git a/gothic-userapi/oCCSProps.inl b/gothic-userapi/oCCSProps.inl
diff --git a/gothic-userapi/oCCSTrigger.inl b/gothic-userapi/oCCSTrigger.inl
diff --git a/gothic-userapi/oCCollObjectCharacter.inl b/gothic-userapi/oCCollObjectCharacter.inl
diff --git a/gothic-userapi/oCDoc.inl b/gothic-userapi/oCDoc.inl
diff --git a/gothic-userapi/oCDocumentManager.inl b/gothic-userapi/oCDocumentManager.inl
diff --git a/gothic-userapi/oCDummyVobGenerator.inl b/gothic-userapi/oCDummyVobGenerator.inl
diff --git a/gothic-userapi/oCEmitterKey.inl b/gothic-userapi/oCEmitterKey.inl
diff --git a/gothic-userapi/oCGame.inl b/gothic-userapi/oCGame.inl
diff --git a/gothic-userapi/oCGameInfo.inl b/gothic-userapi/oCGameInfo.inl
diff --git a/gothic-userapi/oCGame_TObjectRoutine.inl b/gothic-userapi/oCGame_TObjectRoutine.inl
diff --git a/gothic-userapi/oCGuilds.inl b/gothic-userapi/oCGuilds.inl
diff --git a/gothic-userapi/oCHelp.inl b/gothic-userapi/oCHelp.inl
diff --git a/gothic-userapi/oCHelpScreen.inl b/gothic-userapi/oCHelpScreen.inl
diff --git a/gothic-userapi/oCInfo.inl b/gothic-userapi/oCInfo.inl
diff --git a/gothic-userapi/oCInfoChoice.inl b/gothic-userapi/oCInfoChoice.inl
diff --git a/gothic-userapi/oCInfoManager.inl b/gothic-userapi/oCInfoManager.inl
diff --git a/gothic-userapi/oCInfo_Tpd.inl b/gothic-userapi/oCInfo_Tpd.inl
diff --git a/gothic-userapi/oCInformationManager.inl b/gothic-userapi/oCInformationManager.inl
diff --git a/gothic-userapi/oCItem.inl b/gothic-userapi/oCItem.inl
diff --git a/gothic-userapi/oCItemContainer.inl b/gothic-userapi/oCItemContainer.inl
diff --git a/gothic-userapi/oCItemReactModule.inl b/gothic-userapi/oCItemReactModule.inl
diff --git a/gothic-userapi/oCLogEntry.inl b/gothic-userapi/oCLogEntry.inl
diff --git a/gothic-userapi/oCLogManager.inl b/gothic-userapi/oCLogManager.inl
diff --git a/gothic-userapi/oCLogScreen.inl b/gothic-userapi/oCLogScreen.inl
diff --git a/gothic-userapi/oCLogTopic.inl b/gothic-userapi/oCLogTopic.inl
diff --git a/gothic-userapi/oCMOB.inl b/gothic-userapi/oCMOB.inl
diff --git a/gothic-userapi/oCMagFrontier.inl b/gothic-userapi/oCMagFrontier.inl
diff --git a/gothic-userapi/oCMag_Book.inl b/gothic-userapi/oCMag_Book.inl