From 98472dbb7b2fc092e8eb673614737777414843a2 Mon Sep 17 00:00:00 2001 From: yzh Date: Thu, 1 Feb 2024 14:58:32 +0800 Subject: [PATCH] vs config file --- .gitignore | 5 ++--- source/CMakeSettings.json | 19 +++++++++++++++---- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index e9282ec..2ca1f10 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,8 @@ enc_temp_folder/ .cache/ attic/chucklefish/ tiled/ -assets/user/ -assets/devel/ -assets/packed.pak +assets/* +!assets/opensb mods/*.pak mods/* */.vs/ diff --git a/source/CMakeSettings.json b/source/CMakeSettings.json index 86e0011..d9c6622 100644 --- a/source/CMakeSettings.json +++ b/source/CMakeSettings.json @@ -2,11 +2,11 @@ "configurations": [ { "name": "x64-RelWithDebInfo", - "generator": "Ninja", + "generator": "Visual Studio 17 2022 Win64", "configurationType": "RelWithDebInfo", "inheritEnvironments": [ "msvc_x64_x64" ], - "buildRoot": "${projectDir}\\..\\build", - "installRoot": "${projectDir}\\..\\out\\install\\${name}", + "buildRoot": "${projectDir}\\..\\build\\${name}", + "installRoot": "${projectDir}\\..\\dist\\install\\${name}", "cmakeCommandArgs": "-DCMAKE_INCLUDE_PATH=\"..\\lib\\windows\\include\" -DCMAKE_LIBRARY_PATH=\"..\\lib\\windows\"", "variables": [ { @@ -18,8 +18,19 @@ "name": "STAR_ENABLE_DISCORD_INTEGRATION", "value": "True", "type": "BOOL" + }, + { + "name": "STAR_USE_JEMALLOC", + "value": "True", + "type": "BOOL" + }, + { + "name": "CMAKE_CONFIGURATION_TYPES", + "value": "RelWithAsserts", + "type": "STRING" } - ] + ], + "cmakeExecutable": "C:/Program Files/CMake/bin/cmake.exe" } ] } \ No newline at end of file