Folder restructuring from primedev (#624)

Copies of over the primedev folder structure for easier cherry-picking of further changes

Co-authored-by: F1F7Y <filip.bartos07@proton.me>

.github/workflows/ci.yml

@@ -20,10 +20,10 @@ jobs:
       - name: Setup resource file version
         shell: bash
         run: |
-          sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' NorthstarLauncher/resources.rc
-          sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' NorthstarDLL/resources.rc
+          sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' primedev/primelauncher/resources.rc
+          sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' primedev/resources.rc
           FILEVERSION=$(echo ${{ env.NORTHSTAR_VERSION }} | tr '.' ',' | sed -E 's/-rc[0-9]+//' | tr -d '[:alpha:]')
-          sed -i "s/0,0,0,1/${FILEVERSION}/g" NorthstarDLL/ns_version.h
+          sed -i "s/0,0,0,1/${FILEVERSION}/g" primedev/ns_version.h
       - name: Build
         run: cmake --build .
       - name: Extract Short Commit Hash
@@ -43,8 +43,8 @@ jobs:
     - uses: actions/checkout@v3
     - uses: DoozyX/clang-format-lint-action@v0.16.2
       with:
-        source: 'NorthstarDLL NorthstarLauncher'
-        exclude: 'NorthstarDLL/include loader_launcher_proxy loader_wsock32_proxy'
+        source: 'primedev'
+        exclude: 'primedev/include primedev/thirdparty primedev/wsockproxy'
         extensions: 'h,cpp'
         clangFormatVersion: 16
         style: file

.github/workflows/release.yml

@@ -25,10 +25,10 @@ jobs:
       - name: Setup resource file version
         shell: bash
         run: |
-          sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' NorthstarLauncher/resources.rc
-          sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' NorthstarDLL/resources.rc
+          sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' primedev/primelauncher/resources.rc
+          sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' primedev/resources.rc
           FILEVERSION=$(echo ${{ env.NORTHSTAR_VERSION }} | tr '.' ',' | sed -E 's/-rc[0-9]+//' | tr -d '[:alpha:]')
-          sed -i "s/0,0,0,1/${FILEVERSION}/g" NorthstarDLL/ns_version.h
+          sed -i "s/0,0,0,1/${FILEVERSION}/g" primedev/ns_version.h
       - name: Build
         run: cmake --build .
       - name: Upload launcher build as artifact

.gitmodules

@@ -1,11 +1,11 @@
 [submodule "thirdparty/libcurl"]
-	path = thirdparty/libcurl
+	path = primedev/thirdparty/libcurl
 	url = https://github.com/curl/curl
 	ignore = untracked
 [submodule "thirdparty/minhook"]
-	path = thirdparty/minhook
+	path = primedev/thirdparty/minhook
 	url = https://github.com/TsudaKageyu/minhook
 	ignore = untracked
 [submodule "thirdparty/minizip"]
-	path = thirdparty/minizip
+	path = primedev/thirdparty/minizip
 	url = https://github.com/zlib-ng/minizip-ng.git

CMakeLists.txt

@@ -24,10 +24,11 @@ set(NS_BINARY_DIR ${CMAKE_BINARY_DIR}/game)
 message(STATUS "NS: Building to ${NS_BINARY_DIR}")
 
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/primedev/cmake")
 include(utils)
 
+include_directories(primedev)
+include_directories(primedev/thirdparty)
+
 # Targets
-add_subdirectory(loader_wsock32_proxy)
-add_subdirectory(NorthstarDLL)
-add_subdirectory(NorthstarLauncher)
+add_subdirectory(primedev)

README.md

@@ -9,4 +9,4 @@ Check [BUILD.md](BUILD.md) for instructions on how to compile, you can also down
 
 ## Format
 
-This project uses [clang-format](https://clang.llvm.org/docs/ClangFormat.html), make sure you run `clang-format -i --style=file NorthstarLauncher/*.cpp NorthstarLauncher/*.h NorthstarDLL/*.cpp NorthstarDLL/*.h` when opening a Pull Request. Check the tool's website for instructions on how to integrate it with your IDE.
+This project uses [clang-format](https://clang.llvm.org/docs/ClangFormat.html), make sure you run `clang-format -i --style=file --exclude=primedev/include primedev/*.cpp primedev/*.h` when opening a Pull Request. Check the tool's website for instructions on how to integrate it with your IDE.

cmake/Findminhook.cmake

@@ -1,8 +0,0 @@
-
-if(NOT minhook_FOUND)
-	check_init_submodule(${PROJECT_SOURCE_DIR}/thirdparty/minhook)
-
-	add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/minhook minhook)
-	set(minhook_FOUND 1 PARENT_SCOPE)
-endif()
-

cmake/Findspdlog.cmake

@@ -1,8 +0,0 @@
-
-if(NOT spdlog_FOUND)
-	check_init_submodule(${PROJECT_SOURCE_DIR}/thirdparty/spdlog)
-
-	add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/spdlog spdlog)
-	set(spdlog_FOUND 1 PARENT_SCOPE)
-endif()
-

primedev/CMakeLists.txt

@@ -0,0 +1,3 @@
+include(Northstar.cmake)
+include(Launcher.cmake)
+include(WSockProxy.cmake)

primedev/Launcher.cmake

@@ -1,8 +1,8 @@
 # NorthstarLauncher
 
 add_executable(NorthstarLauncher
-               "main.cpp"
-               "resources.rc"
+               "primelauncher/main.cpp"
+               "primelauncher/resources.rc"
 )
 
 target_compile_definitions(NorthstarLauncher PRIVATE

primedev/Northstar.cmake

@@ -167,11 +167,6 @@ target_link_libraries(NorthstarDLL PRIVATE
                       version.lib
 )
 
-target_include_directories(NorthstarDLL PRIVATE
-                           ${CMAKE_SOURCE_DIR}/NorthstarDLL
-                           ${CMAKE_SOURCE_DIR}/thirdparty
-)
-
 target_precompile_headers(NorthstarDLL PRIVATE pch.h)
 
 target_compile_definitions(NorthstarDLL PRIVATE

primedev/WSockProxy.cmake

@@ -3,11 +3,11 @@
 find_package(minhook REQUIRED)
 
 add_library(loader_wsock32_proxy SHARED
-            "dllmain.cpp"
-            "loader.cpp"
-            "loader.h"
-            "wsock32.asm"
-            "wsock32.def"
+            "wsockproxy/dllmain.cpp"
+            "wsockproxy/loader.cpp"
+            "wsockproxy/loader.h"
+            "wsockproxy/wsock32.asm"
+            "wsockproxy/wsock32.def"
 )
 
 target_link_libraries(loader_wsock32_proxy PRIVATE
@@ -31,7 +31,7 @@ target_link_libraries(loader_wsock32_proxy PRIVATE
                       odbccp32.lib
 )
 
-target_precompile_headers(loader_wsock32_proxy PRIVATE pch.h)
+target_precompile_headers(loader_wsock32_proxy PRIVATE wsockproxy/pch.h)
 
 target_compile_definitions(loader_wsock32_proxy PRIVATE
                            UNICODE

primedev/cmake/Findlibcurl.cmake

@@ -1,7 +1,7 @@
 
 
 if (NOT libcurl_FOUND)
-	check_init_submodule(${PROJECT_SOURCE_DIR}/thirdparty/libcurl)
+	check_init_submodule(${PROJECT_SOURCE_DIR}/primedev/thirdparty/libcurl)
 
 	set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libraries")
 	set(BUILD_CURL_EXE OFF CACHE BOOL "Build curl EXE")
@@ -13,6 +13,6 @@ if (NOT libcurl_FOUND)
 	set(CURL_CA_BUNDLE "none" CACHE STRING "Disable CA Bundle")
 	set(CURL_CA_PATH "none" CACHE STRING "Disable CA Path")
 
-	add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/libcurl libcurl)
+	add_subdirectory(${PROJECT_SOURCE_DIR}/primedev/thirdparty/libcurl libcurl)
 	set(libcurl_FOUND 1 PARENT_SCOPE)
 endif()

primedev/cmake/Findminhook.cmake

@@ -0,0 +1,7 @@
+
+if(NOT minhook_FOUND)
+	check_init_submodule(${PROJECT_SOURCE_DIR}/primedev/thirdparty/minhook)
+
+	add_subdirectory(${PROJECT_SOURCE_DIR}/primedev/thirdparty/minhook minhook)
+	set(minhook_FOUND 1)
+endif()

primedev/cmake/Findminizip.cmake

@@ -1,6 +1,6 @@
 
 if(NOT minizip_FOUND)
-	check_init_submodule(${PROJECT_SOURCE_DIR}/thirdparty/minizip)
+	check_init_submodule(${PROJECT_SOURCE_DIR}/primedev/thirdparty/minizip)
 
 	set(MZ_ZLIB ON CACHE BOOL "Enable ZLIB compression, needed for DEFLATE")
 	set(MZ_BZIP2 OFF CACHE BOOL "Disable BZIP2 compression")
@@ -10,7 +10,7 @@ if(NOT minizip_FOUND)
 	set(MZ_ZSTD OFF CACHE BOOL "Disable ZSTD compression")
 	set(MZ_SIGNING OFF CACHE BOOL "Disable zip signing support")
 
-	add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/minizip minizip)
+	add_subdirectory(${PROJECT_SOURCE_DIR}/primedev/thirdparty/minizip minizip)
 	set(minizip_FOUND 1 PARENT_SCOPE)
 endif()
 

primedev/cmake/Findspdlog.cmake

@@ -0,0 +1,7 @@
+
+if(NOT spdlog_FOUND)
+	check_init_submodule(${PROJECT_SOURCE_DIR}/primedev/thirdparty/spdlog)
+
+	add_subdirectory(${PROJECT_SOURCE_DIR}/primedev/thirdparty/spdlog spdlog)
+	set(spdlog_FOUND 1)
+endif()