From 89996405ee6341252836d606d5de02fff83ec3ab Mon Sep 17 00:00:00 2001 From: F1F7Y <64418963+F1F7Y@users.noreply.github.com> Date: Thu, 22 Jun 2023 11:47:46 +0200 Subject: Move to cmake (#467) Moves the entire project to cmake as the build system --- .github/workflows/ci.yml | 13 +- .github/workflows/release.yml | 16 +- .gitignore | 25 + BUILD.md | 21 +- CMakeLists.txt | 24 + CMakeSettings.json | 26 + NorthstarDLL/CMakeLists.txt | 178 +++ NorthstarDLL/NorthstarDLL.vcxproj | 558 -------- NorthstarDLL/NorthstarDLL.vcxproj.filters | 1462 -------------------- NorthstarLauncher/CMakeLists.txt | 33 + NorthstarLauncher/NorthstarLauncher.vcxproj | 147 -- .../NorthstarLauncher.vcxproj.filters | 157 --- R2Northstar.sln | 36 - loader_wsock32_proxy/CMakeLists.txt | 49 + loader_wsock32_proxy/loader_wsock32_proxy.vcxproj | 120 -- .../loader_wsock32_proxy.vcxproj.filters | 52 - 16 files changed, 362 insertions(+), 2555 deletions(-) create mode 100644 CMakeLists.txt create mode 100644 CMakeSettings.json create mode 100644 NorthstarDLL/CMakeLists.txt delete mode 100644 NorthstarDLL/NorthstarDLL.vcxproj delete mode 100644 NorthstarDLL/NorthstarDLL.vcxproj.filters create mode 100644 NorthstarLauncher/CMakeLists.txt delete mode 100644 NorthstarLauncher/NorthstarLauncher.vcxproj delete mode 100644 NorthstarLauncher/NorthstarLauncher.vcxproj.filters delete mode 100644 R2Northstar.sln create mode 100644 loader_wsock32_proxy/CMakeLists.txt delete mode 100644 loader_wsock32_proxy/loader_wsock32_proxy.vcxproj delete mode 100644 loader_wsock32_proxy/loader_wsock32_proxy.vcxproj.filters diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1ac19129..e98d7cd1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,10 +10,12 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - - name: Setup MSBuild - uses: microsoft/setup-msbuild@v1.1 + - name: Setup msvc + uses: ilammy/msvc-dev-cmd@v1 + - name: Configure cmake + run: cmake -G "Ninja" -DCMAKE_BUILD_TYPE:STRING="${{ env.BUILD_PROFILE }}" - name: Build - run: msbuild /p:Configuration=${{ env.BUILD_PROFILE }} + run: cmake --build . - name: Extract Short Commit Hash id: extract shell: bash @@ -23,10 +25,7 @@ jobs: with: name: NorthstarLauncher-${{ steps.extract.outputs.commit }} path: | - x64/${{ env.BUILD_PROFILE }}/*.dll - x64/${{ env.BUILD_PROFILE }}/*.exe - x64/${{ env.BUILD_PROFILE }}/*.pdb - x64/${{ env.BUILD_PROFILE }}/*.txt + game/ format-check: runs-on: ubuntu-latest diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index adc7cc6c..e5ba1138 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,8 +16,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - - name: Setup MSBuild - uses: microsoft/setup-msbuild@v1.1 + - name: Setup msvc + uses: ilammy/msvc-dev-cmd@v1 + - name: Configure cmake + run: cmake -G "Ninja" -DCMAKE_BUILD_TYPE:STRING="Release" - name: Setup resource file version shell: bash run: | @@ -25,22 +27,20 @@ jobs: 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 - name: Build - run: | - msbuild /p:Configuration=Release R2Northstar.sln + run: cmake --build . - name: Upload launcher build as artifact uses: actions/upload-artifact@v3 with: name: northstar-launcher path: | - x64/Release/*.dll - x64/Release/*.exe - x64/Release/*.txt + game/ - name: Upload debug build artifact uses: actions/upload-artifact@v3 with: name: launcher-debug-files path: | - x64/Release/*.pdb + game/*.pdb + game/bin/x64_retail/*.pdb upload-launcher-to-release: if: startsWith(github.ref, 'refs/tags/v') diff --git a/.gitignore b/.gitignore index dfcfd56f..c3c50a40 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,31 @@ # Mono auto generated files mono_crash.* +# CMake output +out/ +game/ +build/ +CMakeFiles/ +cmake_install.cmake +CMakeCache.txt +CopyOfCMakeCache.txt + +# Ninja build files +.ninja_deps +.ninja_log +build.ninja + +# Visual studio build files +*.vcxproj +*.vcxproj.filters +*.sln + +# Build results +# These ignore *.lib and *.exp in the specified +loader_wsock32_proxy/wsock32.* +NorthstarDLL/Northstar.* +NorthstarLauncher/NorthstarLauncher.* + # Build results [Dd]ebug/ [Dd]ebugPublic/ diff --git a/BUILD.md b/BUILD.md index 283e67ae..06ba4957 100644 --- a/BUILD.md +++ b/BUILD.md @@ -12,26 +12,31 @@ The following steps will allow you to compile your own NorthstarLauncher executa ![Desktop Development Workload](https://user-images.githubusercontent.com/40443620/147722260-b6ec90e9-7b74-4fb7-b512-680c039afaef.png) -6. **Open the NorthstarLauncher folder** you unzipped with Visual Studio. A tab should open on the right hand side titled "Solution Explorer." +6. **Open the NorthstarLauncher folder** you unzipped with Visual Studio. +7. You may be prompted by visual studio to generate the cmake cache. To do this open the root `CMakeLists.txt` and click **Generate**. Once you do this you should be able to build the project. +![Generate CMake Cache Prompt](https://github.com/R2Northstar/NorthstarLauncher/assets/64418963/2d825acb-3118-4cf0-84d2-cbc9174dece5) -This is a good time to edit the code. From the Solution Explorer, you can find any file you want to modify and do so. Don't forget to save your changes. +8. In the top ribbon, press on **Build,** then **Build all.** -7. **Double click on R2Northstar.sln** in the Solution Explorer. If you have not installed the Desktop Development Workload, you might be prompted now. If everything is correct, the Solution Explorer should change to two files: Northstar and NorthstarLauncher -8. In the top ribbon, press on **Build,** then **Build Solution.** - -![Build Ribbon Button](https://user-images.githubusercontent.com/40443620/147722646-3f50f6f4-61dd-4458-8f16-7dafec0be979.png) +![Build Ribbon Button](https://github.com/R2Northstar/NorthstarLauncher/assets/64418963/cd8e87b6-7b0f-462c-88bf-639777396501) 9. Wait for your build to finish. You can check on its status from the Output tab at the bottom -10. Once your build is finished, **Open the directory in File Explorer.** Then, go to x86 > Debug. You should see NorthstarLauncher.exe and Northstar.dll, as well as a couple other files. +10. Once your build is finished, **Open the directory in File Explorer.** Then, go to `build/game`. You should see NorthstarLauncher.exe and Northstar.dll, as well as a couple other files. 11. **_In your Titanfall2 directory_**, move the preexisting NorthstarLauncher.exe and Northstar.dll into a new folder. You'll want to keep the default launcher backed up before testing any changes. 12. Back in the build debug directory, **Move NorthstarLauncher.exe and Northstar.dll to your Titanfall2 folder.** If everything is correct, you should now be able to launch the Northstar client with your changes applied. +Alternatively you can move your game to the `build/game/` folder and launch directly from visual studio instead of copying the files manually. + ### VS Build Tools Developers who can work a command line may be interested in using [Visual Studio Build Tools](https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2022) to compile the project, as an alternative to installing the full Visual Studio IDE. -Follow the same steps as above for Visual Studio Build Tools, but instead of opening in Visual Studio, run the Command Prompt for VS 2022 and navigate to the NorthstarLauncher, then run ```msbuild```, which will build the project for you. +- Follow the same steps as above for Visual Studio Build Tools, but instead of opening in Visual Studio, run the Command Prompt for VS 2022 and navigate to the NorthstarLauncher. + +- Run `cmake . -G "Ninja"` to generate build files. + +- Run `cmake --build .` to build the project. diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 00000000..18030b4a --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,24 @@ +cmake_minimum_required(VERSION 3.15) + +project(Northstar CXX ASM_MASM) + +# Language specs +set(CMAKE_CXX_STANDARD 20) +set(CMAKE_C_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_VS_PLATFORM_TOOLSET v143) + +# This determines the real binary root directory +set(NS_BINARY_DIR ${CMAKE_BINARY_DIR}/game) +# NOTE [Fifty]: Visual studio deems Build root with the value "${projectDir}" +# in CMakeSettings.json as invalid and defaults to using a temporary dir +# somewhere in %USER%/CMakeBuilds. To combat this we set it to "${projectDir}/build" +# and then link binaries in ${CMAKE_BINARY_DIR}/game. This means you can copy your +# game into ${CMAKE_BINARY_DIR}/game without it being cluttered up by cmake files. + +message("NS: Building to ${NS_BINARY_DIR}") + +# Targets +add_subdirectory(loader_wsock32_proxy) +add_subdirectory(NorthstarDLL) +add_subdirectory(NorthstarLauncher) diff --git a/CMakeSettings.json b/CMakeSettings.json new file mode 100644 index 00000000..1f1b37c2 --- /dev/null +++ b/CMakeSettings.json @@ -0,0 +1,26 @@ +{ + "configurations": [ + { + "name": "x64-Debug", + "generator": "Ninja", + "configurationType": "Debug", + "inheritEnvironments": [ "msvc_x64_x64" ], + "buildRoot": "${projectDir}\\build", + "installRoot": "${projectDir}\\out\\install\\${name}", + "cmakeCommandArgs": "", + "buildCommandArgs": "", + "ctestCommandArgs": "" + }, + { + "name": "x64-Release", + "generator": "Ninja", + "configurationType": "Release", + "buildRoot": "${projectDir}\\build", + "installRoot": "${projectDir}\\out\\install\\${name}", + "cmakeCommandArgs": "", + "buildCommandArgs": "", + "ctestCommandArgs": "", + "inheritEnvironments": [ "msvc_x64_x64" ] + } + ] +} \ No newline at end of file diff --git a/NorthstarDLL/CMakeLists.txt b/NorthstarDLL/CMakeLists.txt new file mode 100644 index 00000000..f9d61a2c --- /dev/null +++ b/NorthstarDLL/CMakeLists.txt @@ -0,0 +1,178 @@ +# NorthstarDLL + +add_library(NorthstarDLL SHARED + "client/audio.cpp" + "client/audio.h" + "client/chatcommand.cpp" + "client/clientauthhooks.cpp" + "client/clientruihooks.cpp" + "client/clientvideooverrides.cpp" + "client/debugoverlay.cpp" + "client/demofixes.cpp" + "client/diskvmtfixes.cpp" + "client/languagehooks.cpp" + "client/latencyflex.cpp" + "client/localchatwriter.cpp" + "client/localchatwriter.h" + "client/modlocalisation.cpp" + "client/r2client.cpp" + "client/r2client.h" + "client/rejectconnectionfixes.cpp" + "config/profile.cpp" + "config/profile.h" + "core/convar/concommand.cpp" + "core/convar/concommand.h" + "core/convar/convar.cpp" + "core/convar/convar.h" + "core/convar/cvar.cpp" + "core/convar/cvar.h" + "core/filesystem/filesystem.cpp" + "core/filesystem/filesystem.h" + "core/filesystem/rpakfilesystem.cpp" + "core/filesystem/rpakfilesystem.h" + "core/math/bitbuf.h" + "core/math/bits.cpp" + "core/math/bits.h" + "core/math/color.cpp" + "core/math/color.h" + "core/math/vector.h" + "core/hooks.cpp" + "core/hooks.h" + "core/macros.h" + "core/memalloc.cpp" + "core/memalloc.h" + "core/memory.cpp" + "core/memory.h" + "core/sourceinterface.cpp" + "core/sourceinterface.h" + "core/structs.h" + "core/tier0.cpp" + "core/tier0.h" + "dedicated/dedicated.cpp" + "dedicated/dedicated.h" + "dedicated/dedicatedlogtoclient.cpp" + "dedicated/dedicatedlogtoclient.h" + "dedicated/dedicatedmaterialsystem.cpp" + "engine/host.cpp" + "engine/hoststate.cpp" + "engine/hoststate.h" + "engine/r2engine.cpp" + "engine/r2engine.h" + "engine/runframe.cpp" + "logging/crashhandler.cpp" + "logging/crashhandler.h" + "logging/logging.cpp" + "logging/logging.h" + "logging/loghooks.cpp" + "logging/loghooks.h" + "logging/sourceconsole.cpp" + "logging/sourceconsole.h" + "masterserver/masterserver.cpp" + "masterserver/masterserver.h" + "mods/compiled/kb_act.cpp" + "mods/compiled/modkeyvalues.cpp" + "mods/compiled/modpdef.cpp" + "mods/compiled/modscriptsrson.cpp" + "mods/modmanager.cpp" + "mods/modmanager.h" + "plugins/plugin_abi.h" + "plugins/pluginbackend.cpp" + "plugins/pluginbackend.h" + "plugins/plugins.cpp" + "plugins/plugins.h" + "scripts/client/clientchathooks.cpp" + "scripts/client/cursorposition.cpp" + "scripts/client/scriptbrowserhooks.cpp" + "scripts/client/scriptmainmenupromos.cpp" + "scripts/client/scriptmodmenu.cpp" + "scripts/client/scriptserverbrowser.cpp" + "scripts/client/scriptservertoclientstringcommand.cpp" + "scripts/server/miscserverfixes.cpp" + "scripts/server/miscserverscript.cpp" + "scripts/server/scriptuserinfo.cpp" + "scripts/scriptdatatables.cpp" + "scripts/scripthttprequesthandler.cpp" + "scripts/scripthttprequesthandler.h" + "scripts/scriptjson.cpp" + "scripts/scriptutility.cpp" + "server/auth/bansystem.cpp" + "server/auth/bansystem.h" + "server/auth/serverauthentication.cpp" + "server/auth/serverauthentication.h" + "server/alltalk.cpp" + "server/buildainfile.cpp" + "server/r2server.cpp" + "server/r2server.h" + "server/serverchathooks.cpp" + "server/serverchathooks.h" + "server/servernethooks.cpp" + "server/serverpresence.cpp" + "server/serverpresence.h" + "shared/exploit_fixes/exploitfixes.cpp" + "shared/exploit_fixes/exploitfixes_lzss.cpp" + "shared/exploit_fixes/exploitfixes_utf8parser.cpp" + "shared/exploit_fixes/ns_limits.cpp" + "shared/exploit_fixes/ns_limits.h" + "shared/gamepresence.cpp" + "shared/gamepresence.h" + "shared/keyvalues.cpp" + "shared/keyvalues.h" + "shared/maxplayers.cpp" + "shared/maxplayers.h" + "shared/misccommands.cpp" + "shared/misccommands.h" + "shared/playlist.cpp" + "shared/playlist.h" + "squirrel/squirrel.cpp" + "squirrel/squirrel.h" + "squirrel/squirrelautobind.cpp" + "squirrel/squirrelautobind.h" + "squirrel/squirrelclasstypes.h" + "squirrel/squirreldatatypes.h" + "util/printcommands.cpp" + "util/printcommands.h" + "util/printmaps.cpp" + "util/printmaps.h" + "util/utils.cpp" + "util/utils.h" + "util/version.cpp" + "util/version.h" + "util/wininfo.cpp" + "util/wininfo.h" + "audio_asm.asm" + "dllmain.cpp" + "dllmain.h" + "ns_version.h" +) + +target_link_libraries(NorthstarDLL PRIVATE + ${CMAKE_SOURCE_DIR}/include/MinHook.x64.lib + ${CMAKE_SOURCE_DIR}/include/libcurl/lib/libcurl_a.lib + Ws2_32.lib + Crypt32.lib + Cryptui.lib + dbghelp.lib + Wldap32.lib + Normaliz.lib + Bcrypt.lib + version.lib +) + +target_include_directories(NorthstarDLL PRIVATE + ${CMAKE_SOURCE_DIR}/NorthstarDLL + ${CMAKE_SOURCE_DIR}/include +) + +target_precompile_headers(NorthstarDLL PRIVATE pch.h) + +target_compile_definitions(NorthstarDLL PRIVATE + UNICODE + _UNICODE + CURL_STATICLIB +) + +set_target_properties(NorthstarDLL PROPERTIES + RUNTIME_OUTPUT_DIRECTORY ${NS_BINARY_DIR} + OUTPUT_NAME Northstar + LINK_FLAGS "/MANIFEST:NO /DEBUG" +) diff --git a/NorthstarDLL/NorthstarDLL.vcxproj b/NorthstarDLL/NorthstarDLL.vcxproj deleted file mode 100644 index 464c0b58..00000000 --- a/NorthstarDLL/NorthstarDLL.vcxproj +++ /dev/null @@ -1,558 +0,0 @@ - - - - - Debug - x64 - - - Release - x64 - - - - 16.0 - Win32Proj - {cfad2623-064f-453c-8196-79ee10292e32} - NorthstarDedicatedTest - 10.0 - NorthstarDLL - - - - DynamicLibrary - true - v143 - Unicode - - - DynamicLibrary - false - v143 - true - Unicode - - - - - - - - - - - - - - - - true - Northstar - - - false - Northstar - - - - Level3 - true - _DEBUG;NORTHSTARDEDICATEDTEST_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions);CURL_STATICLIB - true - Use - pch.h - stdcpp20 - $(ProjectDir);$(SolutionDir)include;%(AdditionalIncludeDirectories) - pch.h - - - Windows - true - false - $(SolutionDir)include\MinHook.x64.lib;$(SolutionDir)include\libcurl\lib\libcurl_a.lib;Ws2_32.lib;Crypt32.lib;Cryptui.lib;dbghelp.lib;Wldap32.lib;Normaliz.lib;Bcrypt.lib;version.lib;%(AdditionalDependencies) - - - %(AdditionalLibraryDirectories) - - - - - - - copy /Y "$(TargetPath)" "$(SolutionDir)..\..\" - - - - - Level3 - true - true - true - NDEBUG;NORTHSTARDEDICATEDTEST_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions);CURL_STATICLIB - true - Use - pch.h - stdcpp20 - $(ProjectDir);$(SolutionDir)include;%(AdditionalIncludeDirectories) - MultiThreadedDLL - Disabled - pch.h - - - Windows - true - true - true - false - $(SolutionDir)include\MinHook.x64.lib;$(SolutionDir)include\libcurl\lib\libcurl_a.lib;Ws2_32.lib;Crypt32.lib;Cryptui.lib;dbghelp.lib;Wldap32.lib;Normaliz.lib;Bcrypt.lib;version.lib;%(AdditionalDependencies) - - - %(AdditionalLibraryDirectories) - - - - - - - IF EXIST "$(SolutionDir)..\..\Titanfall2.exe" del "$(SolutionDir)..\..\Northstar.dll" && copy /Y "$(TargetPath)" "$(SolutionDir)..\..\ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Use - - - - - - - - - - - - - - - - - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/NorthstarDLL/NorthstarDLL.vcxproj.filters b/NorthstarDLL/NorthstarDLL.vcxproj.filters deleted file mode 100644 index 7c6de46e..00000000 --- a/NorthstarDLL/NorthstarDLL.vcxproj.filters +++ /dev/null @@ -1,1462 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {d4199e4b-10d2-43ce-af9c-e1fa79e1e64e} - - - {8596cc1c-0492-4467-91e3-1f03b7e19f77} - - - {11eaa578-6336-456e-9c7c-8bd202470945} - - - {7ecd75d2-7eee-41c4-87b6-3b7c2213f34e} - - - {8afc70f1-639c-49ef-9348-ef6dcece114e} - - - {398efed5-0a92-4d32-b5ba-b4a725b2a70a} - - - {74567974-c66b-45ef-ab28-97b7154ca224} - - - {4ca5392e-7d3d-4066-833f-f534cd5787c3} - - - {94b15898-ef33-41c7-995a-31791fccb7e2} - - - {6495657f-ea55-4552-8aa7-b54eb8e86a99} - - - {85aacdee-0f92-4ec4-b20c-0739c1175055} - - - {4cb0dd89-5f16-4549-a864-34ca3075352a} - - - {ea1e17a6-40b7-4e1b-8edb-e9ae704ce604} - - - {757f33f0-f17b-4ecd-8b95-2157b2d2f03c} - - - {7f9657c5-d4c7-464f-b2f6-d9afbbe0bb42} - - - {e45d18f7-8992-47ac-837c-4cb99f5a0487} - - - {62167757-13c1-4f57-a8f5-15a3c800997b} - - - {25e33568-4125-406d-8661-01ae2abf61a5} - - - {008e67ce-bf6a-4792-9ded-69a434edea00} - - - {dbf03bda-dd0a-44ce-a6b1-361f7f21a10e} - - - {d83e1c5c-c9c7-47a2-b406-9b5a93e3cc29} - - - {57fb0fa6-7665-4d37-bb2b-6f5570023d83} - - - {08436037-e86f-4410-8db6-37c8b10ca5a1} - - - {e8fb33f4-47b5-4fd9-b6c0-2ca1bd8cac81} - - - {d60e54d0-b4e4-4210-af6b-59bdd84bed0f} - - - {06c7928e-bf66-446e-9cde-c8135c79d14b} - - - {0b8b4a41-6131-4388-85d2-f5754a304610} - - - {9ccd8616-d961-4c37-96e0-3219bd293afb} - - - {a9390f6a-5031-4c65-a636-82cf90899435} - - - {acf049ba-358a-4520-8813-2f802ce7167e} - - - {0075910c-80c9-490f-a0d4-f9e410e4a918} - - - {31143dec-abe6-477a-9cae-045c5b57380b} - - - {c6c4746d-d6e1-4dba-a3fc-e645b28ac83f} - - - {3fba68ef-d715-4e18-b4a2-05d3fee00e2d} - - - {ae9c5353-a3ab-44a9-a328-91df6aa8c80e} - - - {87869634-fa0f-48f8-a306-94d5a8157e1e} - - - {0ad64562-eb98-4015-a4fc-6fdc63ac9322} - - - {13d0affc-1b4d-4090-8ad6-e9ae8fc56599} - - - {b264a27d-619b-49b3-acbb-4e138ba29daf} - - - {35658430-465d-433c-aa2d-b8266edb205a} - - - {0517ea0b-2eca-4b1c-a0d1-766d4d1d19d2} - - - {6d3f7657-6e58-4007-acd3-0b787f35406a} - - - {b9c0cfad-46d4-41ea-806e-daef3d66c381} - - - {a4f7d529-0b21-48af-82ef-9fb971b802f7} - - - {7ee4b436-a5d3-4680-bf99-bc6d7640ded3} - - - {53a84980-9a1c-46b0-9b6d-06ec35781297} - - - {01e215c3-9fa2-4de1-a3e0-b6a27396c68c} - - - {0fa069c9-302b-4be5-ba47-37e13e181d78} - - - {08a9ca37-8a6e-458c-9da8-6f3dc917ddf7} - - - {2c0b196e-3a11-4655-a158-8a1c84be4471} - - - {122e2230-0605-40ef-8963-6e339d2c725e} - - - {4e0d0f0e-c8f2-4fe1-a787-57060c610553} - - - {9e67fc99-0e20-4155-a167-5d251ea36581} - - - {62b3cff9-b2d8-4c1c-a2a6-1e2138c0ff88} - - - {9a819cdd-ebca-4cba-b231-76b6f98ed6ac} - - - {1a377c09-bd3d-4757-b3bc-9cd0a1e6ac0d} - - - - - Header Files\include - - - Header Files\include\libcurl - - - Header Files\include\libcurl - - - Header Files\include\libcurl - - - Header Files\include\libcurl - - - Header Files\include\libcurl - - - Header Files\include\libcurl - - - Header Files\include\libcurl - - - Header Files\include\libcurl - - - Header Files\include\libcurl - - - Header Files\include\libcurl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\openssl - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson\error - - - Header Files\include\rapidjson\error - - - Header Files\include\rapidjson\internal - - - Header Files\include\rapidjson\internal - - - Header Files\include\rapidjson\internal - - - Header Files\include\rapidjson\internal - - - Header Files\include\rapidjson\internal - - - Header Files\include\rapidjson\internal - - - Header Files\include\rapidjson\internal - - - Header Files\include\rapidjson\internal - - - Header Files\include\rapidjson\internal - - - Header Files\include\rapidjson\internal - - - Header Files\include\rapidjson\internal - - - Header Files\include\rapidjson\internal - - - Header Files\include\rapidjson\msinttypes - - - Header Files\include\rapidjson\msinttypes - - - Header Files\include\spdlog - - - Header Files\include\spdlog - - - Header Files\include\spdlog - - - Header Files\include\spdlog - - - Header Files\include\spdlog - - - Header Files\include\spdlog - - - Header Files\include\spdlog - - - Header Files\include\spdlog - - - Header Files\include\spdlog - - - Header Files\include\spdlog - - - Header Files\include\spdlog - - - Header Files\include\spdlog - - - Header Files\include\spdlog - - - Header Files\include\spdlog - - - Header Files\include\spdlog - - - Header Files\include\spdlog - - - Header Files\include\spdlog\cfg - - - Header Files\include\spdlog\cfg - - - Header Files\include\spdlog\cfg - - - Header Files\include\spdlog\cfg - - - Header Files\include\spdlog\details - - - Header Files\include\spdlog\details - - - Header Files\include\spdlog\details - - - Header Files\include\spdlog\details - - - Header Files\include\spdlog\details - - - Header Files\include\spdlog\details - - - Header Files\include\spdlog\details - - - Header Files\include\spdlog\details - - - Header Files\include\spdlog\details - - - Header Files\include\spdlog\details - - - Header Files\include\spdlog\details - - - Header Files\include\spdlog\details - - - Header Files\include\spdlog\details - - - Header Files\include\spdlog\details - - - Header Files\include\spdlog\details - - - Header Files\include\spdlog\details - - - Header Files\include\spdlog\details - - - Header Files\include\spdlog\details - - - Header Files\include\spdlog\details - - - Header Files\include\spdlog\details - - - Header Files\include\spdlog\details - - - Header Files\include\spdlog\details - - - Header Files\include\spdlog\details - - - Header Files\include\spdlog\details - - - Header Files\include\spdlog\details - - - Header Files\include\spdlog\fmt - - - Header Files\include\spdlog\fmt - - - Header Files\include\spdlog\fmt - - - Header Files\include\spdlog\fmt - - - Header Files\include\spdlog\fmt\bundled - - - Header Files\include\spdlog\fmt\bundled - - - Header Files\include\spdlog\fmt\bundled - - - Header Files\include\spdlog\fmt\bundled - - - Header Files\include\spdlog\fmt\bundled - - - Header Files\include\spdlog\fmt\bundled - - - Header Files\include\spdlog\fmt\bundled - - - Header Files\include\spdlog\fmt\bundled - - - Header Files\include\spdlog\fmt\bundled - - - Header Files\include\spdlog\fmt\bundled - - - Header Files\include\spdlog\fmt\bundled - - - Header Files\include\spdlog\fmt\bundled - - - Header Files\include\spdlog\sinks - - - Header Files\include\spdlog\sinks - - - Header Files\include\spdlog\sinks - - - Header Files\include\spdlog\sinks - - - Header Files\include\spdlog\sinks - - - Header Files\include\spdlog\sinks - - - Header Files\include\spdlog\sinks - - - Header Files\include\spdlog\sinks - - - Header Files\include\spdlog\sinks - - - Header Files\include\spdlog\sinks - - - Header Files\include\spdlog\sinks - - - Header Files\include\spdlog\sinks - - - Header Files\include\spdlog\sinks - - - Header Files\include\spdlog\sinks - - - Header Files\include\spdlog\sinks - - - Header Files\include\spdlog\sinks - - - Header Files\include\spdlog\sinks - - - Header Files\include\spdlog\sinks - - - Header Files\include\spdlog\sinks - - - Header Files\include\spdlog\sinks - - - Header Files\include\spdlog\sinks - - - Header Files\include\spdlog\sinks - - - Header Files\include\spdlog\sinks - - - Header Files\include\spdlog\sinks - - - Header Files\include\spdlog\sinks - - - Header Files\include\spdlog\sinks - - - Header Files\include\spdlog\sinks - - - Header Files\include\spdlog\sinks - - - Header Files\include\spdlog\sinks - - - Header Files\client - - - Header Files\client - - - Header Files\dedicated - - - Header Files\exploit_fixes - - - Header Files\hooks - - - Header Files\hooks - - - Header Files\hooks - - - Header Files\masterserver - - - Header Files\mods - - - Header Files\plugins - - - Header Files\server - - - Header Files\server\auth - - - Header Files\server\auth - - - Header Files\squirrel - - - Header Files\squirrel - - - Header Files\squirrel - - - Header Files\squirrel - - - Header Files\util - - - Header Files - - - Header Files - - - Header Files\config - - - Header Files\engine - - - Header Files\hooks - - - Header Files\shared - - - Header Files\shared - - - Header Files\client - - - Header Files\engine - - - Header Files\server - - - Header Files\hooks - - - Header Files\hooks - - - Header Files\core\convar - - - Header Files\core\convar - - - Header Files\core\convar - - - Header Files\core\filesystem - - - Header Files\core\filesystem - - - Header Files\core\math - - - Header Files\core\math - - - Header Files\core\math - - - Header Files\core\math - - - Header Files\core - - - Header Files\core - - - Header Files\core - - - Header Files\core - - - Header Files\core - - - Header Files\logging - - - Header Files\logging - - - Header Files\logging - - - Header Files\logging - - - Header Files\server - - - Header Files\scripts - - - Header Files\plugins - - - Header Files\plugins - - - Header Files\shared - - - Header Files\util - - - Header Files\shared - - - Header Files\shared - - - Header Files\core - - - Header Files\core - - - Header Files - - - Header Files\util - - - Header Files\dedicated - - - - - Header Files\include\spdlog\fmt\bundled - - - - - Source Files\client - - - Source Files\client - - - Source Files\client - - - Source Files\client - - - Source Files\client - - - Source Files\client - - - Source Files\client - - - Source Files\client - - - Source Files\client - - - Source Files\client - - - Source Files\client - - - Source Files\client - - - Source Files\dedicated - - - Source Files\dedicated - - - Source Files\masterserver - - - Source Files\mods - - - Source Files\mods\compiled - - - Source Files\mods\compiled - - - Source Files\mods\compiled - - - Source Files\mods\compiled - - - Source Files\plugins - - - Source Files\scripts - - - Source Files\scripts - - - Source Files\scripts - - - Source Files\server - - - Source Files\server - - - Source Files\server\auth - - - Source Files\server\auth - - - Source Files\squirrel - - - Source Files\squirrel - - - Source Files\util - - - Source Files - - - Source Files - - - Source Files\config - - - Source Files\engine - - - Source Files\engine - - - Source Files\engine - - - Source Files\shared - - - Source Files\shared - - - Source Files\client - - - Source Files\server - - - Source Files\engine - - - Source Files\logging - - - Source Files\logging - - - Source Files\logging - - - Source Files\logging - - - Source Files\scripts\client - - - Source Files\scripts\client - - - Source Files\scripts\client - - - Source Files\scripts\client - - - Source Files\scripts\client - - - Source Files\scripts\client - - - Source Files\scripts\client - - - Source Files\scripts\server - - - Source Files\scripts\server - - - Source Files\scripts\server - - - Source Files\server - - - Source Files\core\convar - - - Source Files\core\convar - - - Source Files\core\convar - - - Source Files\core\filesystem - - - Source Files\core\filesystem - - - Source Files\core\math - - - Source Files\core\math - - - Source Files\core - - - Source Files\core - - - Source Files\core - - - Source Files\core - - - Source Files\shared\exploit_fixes - - - Source Files\shared\exploit_fixes - - - Source Files\shared\exploit_fixes - - - Source Files\shared\exploit_fixes - - - Source Files\shared - - - Source Files\shared - - - Source Files\util - - - Source Files\util - - - Source Files\scripts - - - Source Files\plugins - - - Source Files\shared - - - Source Files\util - - - Source Files\core - - - Source Files - - - Source Files - - - Source Files\util - - - Source Files\dedicated - - - Source Files\server - - - Source Files\server - - - - - Source Files\client - - - \ No newline at end of file diff --git a/NorthstarLauncher/CMakeLists.txt b/NorthstarLauncher/CMakeLists.txt new file mode 100644 index 00000000..21d2c444 --- /dev/null +++ b/NorthstarLauncher/CMakeLists.txt @@ -0,0 +1,33 @@ +# NorthstarLauncher + +add_executable(NorthstarLauncher + "main.cpp" + "resources.rc" +) + +target_compile_definitions(NorthstarLauncher PRIVATE + UNICODE + _UNICODE +) + +target_link_libraries(NorthstarLauncher PRIVATE + shlwapi.lib + kernel32.lib + user32.lib + gdi32.lib + winspool.lib + comdlg32.lib + advapi32.lib + shell32.lib + ole32.lib + oleaut32.lib + uuid.lib + odbc32.lib + odbccp32.lib + Ws2_32.lib +) + +set_target_properties(NorthstarLauncher PROPERTIES + RUNTIME_OUTPUT_DIRECTORY ${NS_BINARY_DIR} + LINK_FLAGS "/MANIFEST:NO /DEBUG /STACK:8000000" +) diff --git a/NorthstarLauncher/NorthstarLauncher.vcxproj b/NorthstarLauncher/NorthstarLauncher.vcxproj deleted file mode 100644 index 29ea7187..00000000 --- a/NorthstarLauncher/NorthstarLauncher.vcxproj +++ /dev/null @@ -1,147 +0,0 @@ - - - - - Debug - x64 - - - Release - x64 - - - - 16.0 - Win32Proj - {0ea82cb0-53fe-4d4c-96df-47fa970513d0} - LauncherInjector - 10.0 - NorthstarLauncher - - - - Application - true - v143 - Unicode - - - Application - false - v143 - true - Unicode - - - - - - - - - - - - - - - true - - - false - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp20 - /F8000000 %(AdditionalOptions) - $(SolutionDir)\include;%(AdditionalIncludeDirectories) - - - Console - true - shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - 8000000 - - - copy /Y "$(TargetPath)" "$(SolutionDir)..\..\" - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp20 - /F8000000 %(AdditionalOptions) - $(SolutionDir)\include;%(AdditionalIncludeDirectories) - - - Console - true - true - true - shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - 8000000 - - - IF EXIST "$(SolutionDir)..\..\Titanfall2.exe" del "$(SolutionDir)..\..\NorthstarLauncher.exe" && copy /Y "$(TargetPath)" "$(SolutionDir)..\..\ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/NorthstarLauncher/NorthstarLauncher.vcxproj.filters b/NorthstarLauncher/NorthstarLauncher.vcxproj.filters deleted file mode 100644 index 8751c13f..00000000 --- a/NorthstarLauncher/NorthstarLauncher.vcxproj.filters +++ /dev/null @@ -1,157 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {edd42629-a0d5-42b0-88b3-6e63e04770b7} - - - {2afc4c90-5392-4487-bb44-ed261ad1c52c} - - - {20ea1f52-8ae5-47e6-bd72-252c78ce192e} - - - {19fbc37e-7523-475a-84ee-6242e4b12b66} - - - {8f22e7e3-536a-4bc8-ab77-2c62a9b85075} - - - - - Source Files - - - - - Header Files - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson - - - Header Files\include\rapidjson\internal - - - Header Files\include\rapidjson\internal - - - Header Files\include\rapidjson\internal - - - Header Files\include\rapidjson\internal - - - Header Files\include\rapidjson\internal - - - Header Files\include\rapidjson\internal - - - Header Files\include\rapidjson\internal - - - Header Files\include\rapidjson\internal - - - Header Files\include\rapidjson\internal - - - Header Files\include\rapidjson\internal - - - Header Files\include\rapidjson\internal - - - Header Files\include\rapidjson\internal - - - Header Files\include\rapidjson\error - - - Header Files\include\rapidjson\error - - - Header Files\include\rapidjson\msinttypes - - - Header Files\include\rapidjson\msinttypes - - - - - Resource Files - - - - - Resource Files - - - diff --git a/R2Northstar.sln b/R2Northstar.sln deleted file mode 100644 index a89f687d..00000000 --- a/R2Northstar.sln +++ /dev/null @@ -1,36 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32014.148 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NorthstarDLL", "NorthstarDLL\NorthstarDLL.vcxproj", "{CFAD2623-064F-453C-8196-79EE10292E32}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NorthstarLauncher", "NorthstarLauncher\NorthstarLauncher.vcxproj", "{0EA82CB0-53FE-4D4C-96DF-47FA970513D0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loader_wsock32_proxy", "loader_wsock32_proxy\loader_wsock32_proxy.vcxproj", "{CF55F3B5-F348-450A-9CCB-C269F21D629D}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CFAD2623-064F-453C-8196-79EE10292E32}.Debug|x64.ActiveCfg = Debug|x64 - {CFAD2623-064F-453C-8196-79EE10292E32}.Debug|x64.Build.0 = Debug|x64 - {CFAD2623-064F-453C-8196-79EE10292E32}.Release|x64.ActiveCfg = Release|x64 - {CFAD2623-064F-453C-8196-79EE10292E32}.Release|x64.Build.0 = Release|x64 - {0EA82CB0-53FE-4D4C-96DF-47FA970513D0}.Debug|x64.ActiveCfg = Debug|x64 - {0EA82CB0-53FE-4D4C-96DF-47FA970513D0}.Debug|x64.Build.0 = Debug|x64 - {0EA82CB0-53FE-4D4C-96DF-47FA970513D0}.Release|x64.ActiveCfg = Release|x64 - {0EA82CB0-53FE-4D4C-96DF-47FA970513D0}.Release|x64.Build.0 = Release|x64 - {CF55F3B5-F348-450A-9CCB-C269F21D629D}.Debug|x64.ActiveCfg = Debug|x64 - {CF55F3B5-F348-450A-9CCB-C269F21D629D}.Debug|x64.Build.0 = Debug|x64 - {CF55F3B5-F348-450A-9CCB-C269F21D629D}.Release|x64.ActiveCfg = Release|x64 - {CF55F3B5-F348-450A-9CCB-C269F21D629D}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {E617E95C-9157-454C-84C5-8EEC2B5D1032} - EndGlobalSection -EndGlobal diff --git a/loader_wsock32_proxy/CMakeLists.txt b/loader_wsock32_proxy/CMakeLists.txt new file mode 100644 index 00000000..c2616874 --- /dev/null +++ b/loader_wsock32_proxy/CMakeLists.txt @@ -0,0 +1,49 @@ +# loader_wsock32_proxy + +add_library(loader_wsock32_proxy SHARED + "dllmain.cpp" + "loader.cpp" + "loader.h" + "pch.cpp" + "pch.h" + "wsock32.asm" + "wsock32.def" +) + +target_link_libraries(loader_wsock32_proxy PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/include/MinHook.x64.lib + mswsock.lib + ws2_32.lib + Shlwapi.lib + imagehlp.lib + dbghelp.lib + kernel32.lib + user32.lib + gdi32.lib + winspool.lib + comdlg32.lib + advapi32.lib + shell32.lib + ole32.lib + oleaut32.lib + uuid.lib + odbc32.lib + odbccp32.lib +) + +target_include_directories(loader_wsock32_proxy PRIVATE + include +) + +target_precompile_headers(loader_wsock32_proxy PRIVATE pch.h) + +target_compile_definitions(loader_wsock32_proxy PRIVATE + UNICODE + _UNICODE +) + +set_target_properties(loader_wsock32_proxy PROPERTIES + RUNTIME_OUTPUT_DIRECTORY ${NS_BINARY_DIR}/bin/x64_retail + OUTPUT_NAME wsock32 + LINK_FLAGS "/MANIFEST:NO /DEBUG" +) diff --git a/loader_wsock32_proxy/loader_wsock32_proxy.vcxproj b/loader_wsock32_proxy/loader_wsock32_proxy.vcxproj deleted file mode 100644 index d65a8f12..00000000 --- a/loader_wsock32_proxy/loader_wsock32_proxy.vcxproj +++ /dev/null @@ -1,120 +0,0 @@ - - - - - Debug - x64 - - - Release - x64 - - - - 16.0 - Win32Proj - {cf55f3b5-f348-450a-9ccb-c269f21d629d} - loaderwsock32proxy - 10.0 - - - - DynamicLibrary - true - v143 - Unicode - - - DynamicLibrary - false - v143 - true - Unicode - - - - - - - - - - - - - - - - true - wsock32 - - - false - wsock32 - - - - Level3 - true - _DEBUG;LOADERWSOCK32PROXY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - Use - pch.h - stdcpp20 - ..\NorthstarDedicatedTest\ - - - Windows - true - false - wsock32.def - .\include\MinHook.x64.lib;mswsock.lib;ws2_32.lib;Shlwapi.lib;imagehlp.lib;dbghelp.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - Level3 - true - true - true - NDEBUG;LOADERWSOCK32PROXY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - Use - pch.h - ..\NorthstarDedicatedTest\ - stdcpp20 - - - Windows - true - true - true - false - wsock32.def - .\include\MinHook.x64.lib;mswsock.lib;ws2_32.lib;Shlwapi.lib;imagehlp.lib;dbghelp.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;wsock32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - - - - - - - - Create - Create - - - - - - - - - - - - - \ No newline at end of file diff --git a/loader_wsock32_proxy/loader_wsock32_proxy.vcxproj.filters b/loader_wsock32_proxy/loader_wsock32_proxy.vcxproj.filters deleted file mode 100644 index d3c022de..00000000 --- a/loader_wsock32_proxy/loader_wsock32_proxy.vcxproj.filters +++ /dev/null @@ -1,52 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {1b1575f7-3332-478b-9e85-9c0978249a70} - - - - - Header Files - - - Header Files - - - Header Files\include - - - - - Source Files - - - Source Files - - - Source Files - - - - - Source Files - - - - - Source Files - - - -- cgit v1.2.3