diff --git a/appveyor.yml b/appveyor.yml index 0e78310..3416d3e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,6 @@ version: '{build}' image: Visual Studio 2019 configuration: - Release -- Minimalist platform: x64 build: project: source-code/PD-Loader.sln @@ -38,10 +37,9 @@ after_build: 7z a "$env:APPVEYOR_BUILD_FOLDER/PD-Loader-$env:CONFIGURATION-AppVeyor-$env:APPVEYOR_REPO_COMMIT.zip" * - if ( "$env:CONFIGURATION" -imatch "Minimalist" ) - { - rm "$env:TMP/full/plugins/Launcher.dva" - 7z a "$env:APPVEYOR_BUILD_FOLDER/PD-Loader-$env:CONFIGURATION-NoLauncher-AppVeyor-$env:APPVEYOR_REPO_COMMIT.zip" * - } + rm "$env:TMP/full/plugins/Launcher.dva" + rm "$env:TMP/full/plugins/CustoMixer.dva" + rm "$env:TMP/full/plugins/DSCRemote.dva" + 7z a "$env:APPVEYOR_BUILD_FOLDER/PD-Loader-$env:CONFIGURATION-HardMode-AppVeyor-$env:APPVEYOR_REPO_COMMIT.zip" * artifacts: - path: PD-Loader-*.zip diff --git a/source-code/PD-Loader.sln b/source-code/PD-Loader.sln index 57a9747..742597c 100644 --- a/source-code/PD-Loader.sln +++ b/source-code/PD-Loader.sln @@ -19,7 +19,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShaderPatch", "source\plugi EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EnhancedStageManager", "source\plugins\EnhancedStageManager\EnhancedStageManager.vcxproj", "{3C8071F4-22C8-DA6E-A075-C5EC646DAB7E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DivaWig", "source\plugins\DivaWig\DivaWig.vcxproj", "{2394C586-F73B-4EF2-BA3E-2A0FC3034B1A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CustoMixer", "source\plugins\DivaWig\DivaWig.vcxproj", "{2394C586-F73B-4EF2-BA3E-2A0FC3034B1A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DSCRemote", "source\plugins\DSCRemote\DSCRemote.vcxproj", "{8544C599-F73B-4EF2-BA3E-2A0FC3034B1A}" EndProject @@ -28,70 +28,51 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 - Minimalist|x64 = Minimalist|x64 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {CA479467-D518-46A2-AC86-3098ADA99FE5}.Debug|x64.ActiveCfg = Debug|x64 {CA479467-D518-46A2-AC86-3098ADA99FE5}.Debug|x64.Build.0 = Debug|x64 - {CA479467-D518-46A2-AC86-3098ADA99FE5}.Minimalist|x64.ActiveCfg = Minimalist|x64 - {CA479467-D518-46A2-AC86-3098ADA99FE5}.Minimalist|x64.Build.0 = Minimalist|x64 {CA479467-D518-46A2-AC86-3098ADA99FE5}.Release|x64.ActiveCfg = Release|x64 {CA479467-D518-46A2-AC86-3098ADA99FE5}.Release|x64.Build.0 = Release|x64 {2B5533BB-04A1-424F-9BCA-1CA963B46B7F}.Debug|x64.ActiveCfg = Debug|x64 {2B5533BB-04A1-424F-9BCA-1CA963B46B7F}.Debug|x64.Build.0 = Debug|x64 - {2B5533BB-04A1-424F-9BCA-1CA963B46B7F}.Minimalist|x64.ActiveCfg = Minimalist|x64 - {2B5533BB-04A1-424F-9BCA-1CA963B46B7F}.Minimalist|x64.Build.0 = Minimalist|x64 {2B5533BB-04A1-424F-9BCA-1CA963B46B7F}.Release|x64.ActiveCfg = Release|x64 {2B5533BB-04A1-424F-9BCA-1CA963B46B7F}.Release|x64.Build.0 = Release|x64 {60D5E9F4-335F-402B-9A07-D78674DFFC9B}.Debug|x64.ActiveCfg = Debug|x64 {60D5E9F4-335F-402B-9A07-D78674DFFC9B}.Debug|x64.Build.0 = Debug|x64 - {60D5E9F4-335F-402B-9A07-D78674DFFC9B}.Minimalist|x64.ActiveCfg = Minimalist|x64 - {60D5E9F4-335F-402B-9A07-D78674DFFC9B}.Minimalist|x64.Build.0 = Minimalist|x64 {60D5E9F4-335F-402B-9A07-D78674DFFC9B}.Release|x64.ActiveCfg = Release|x64 {60D5E9F4-335F-402B-9A07-D78674DFFC9B}.Release|x64.Build.0 = Release|x64 {B49C6ABE-931C-4F91-9A94-21A41A305FEE}.Debug|x64.ActiveCfg = Debug|x64 {B49C6ABE-931C-4F91-9A94-21A41A305FEE}.Debug|x64.Build.0 = Debug|x64 - {B49C6ABE-931C-4F91-9A94-21A41A305FEE}.Minimalist|x64.ActiveCfg = Minimalist|x64 {B49C6ABE-931C-4F91-9A94-21A41A305FEE}.Release|x64.ActiveCfg = Release|x64 {B49C6ABE-931C-4F91-9A94-21A41A305FEE}.Release|x64.Build.0 = Release|x64 {EE1A551A-49A0-40F2-8C2E-862D0AE55B43}.Debug|x64.ActiveCfg = Debug|x64 {EE1A551A-49A0-40F2-8C2E-862D0AE55B43}.Debug|x64.Build.0 = Debug|x64 - {EE1A551A-49A0-40F2-8C2E-862D0AE55B43}.Minimalist|x64.ActiveCfg = Minimalist|x64 - {EE1A551A-49A0-40F2-8C2E-862D0AE55B43}.Minimalist|x64.Build.0 = Minimalist|x64 {EE1A551A-49A0-40F2-8C2E-862D0AE55B43}.Release|x64.ActiveCfg = Release|x64 {EE1A551A-49A0-40F2-8C2E-862D0AE55B43}.Release|x64.Build.0 = Release|x64 {1994C586-F73B-4EF2-BA3E-2A0FC3034B1A}.Debug|x64.ActiveCfg = Debug|x64 {1994C586-F73B-4EF2-BA3E-2A0FC3034B1A}.Debug|x64.Build.0 = Debug|x64 - {1994C586-F73B-4EF2-BA3E-2A0FC3034B1A}.Minimalist|x64.ActiveCfg = Minimalist|x64 - {1994C586-F73B-4EF2-BA3E-2A0FC3034B1A}.Minimalist|x64.Build.0 = Minimalist|x64 {1994C586-F73B-4EF2-BA3E-2A0FC3034B1A}.Release|x64.ActiveCfg = Release|x64 {1994C586-F73B-4EF2-BA3E-2A0FC3034B1A}.Release|x64.Build.0 = Release|x64 {C07E495E-A16F-48FA-80E4-0296B5234F0B}.Debug|x64.ActiveCfg = Debug|x64 {C07E495E-A16F-48FA-80E4-0296B5234F0B}.Debug|x64.Build.0 = Debug|x64 - {C07E495E-A16F-48FA-80E4-0296B5234F0B}.Minimalist|x64.ActiveCfg = Minimalist|x64 - {C07E495E-A16F-48FA-80E4-0296B5234F0B}.Minimalist|x64.Build.0 = Minimalist|x64 {C07E495E-A16F-48FA-80E4-0296B5234F0B}.Release|x64.ActiveCfg = Release|x64 {C07E495E-A16F-48FA-80E4-0296B5234F0B}.Release|x64.Build.0 = Release|x64 {3C8071F4-22C8-DA6E-A075-C5EC646DAB7E}.Debug|x64.ActiveCfg = Debug|x64 {3C8071F4-22C8-DA6E-A075-C5EC646DAB7E}.Debug|x64.Build.0 = Debug|x64 - {3C8071F4-22C8-DA6E-A075-C5EC646DAB7E}.Minimalist|x64.ActiveCfg = Minimalist|x64 {3C8071F4-22C8-DA6E-A075-C5EC646DAB7E}.Release|x64.ActiveCfg = Release|x64 {3C8071F4-22C8-DA6E-A075-C5EC646DAB7E}.Release|x64.Build.0 = Release|x64 {2394C586-F73B-4EF2-BA3E-2A0FC3034B1A}.Debug|x64.ActiveCfg = Debug|x64 {2394C586-F73B-4EF2-BA3E-2A0FC3034B1A}.Debug|x64.Build.0 = Debug|x64 - {2394C586-F73B-4EF2-BA3E-2A0FC3034B1A}.Minimalist|x64.ActiveCfg = Minimalist|x64 {2394C586-F73B-4EF2-BA3E-2A0FC3034B1A}.Release|x64.ActiveCfg = Release|x64 {2394C586-F73B-4EF2-BA3E-2A0FC3034B1A}.Release|x64.Build.0 = Release|x64 {8544C599-F73B-4EF2-BA3E-2A0FC3034B1A}.Debug|x64.ActiveCfg = Debug|x64 {8544C599-F73B-4EF2-BA3E-2A0FC3034B1A}.Debug|x64.Build.0 = Debug|x64 - {8544C599-F73B-4EF2-BA3E-2A0FC3034B1A}.Minimalist|x64.ActiveCfg = Minimalist|x64 {8544C599-F73B-4EF2-BA3E-2A0FC3034B1A}.Release|x64.ActiveCfg = Release|x64 {8544C599-F73B-4EF2-BA3E-2A0FC3034B1A}.Release|x64.Build.0 = Release|x64 {47181A1D-C22C-4C9C-B4E0-CB6CE886A1D8}.Debug|x64.ActiveCfg = Debug|x64 {47181A1D-C22C-4C9C-B4E0-CB6CE886A1D8}.Debug|x64.Build.0 = Debug|x64 - {47181A1D-C22C-4C9C-B4E0-CB6CE886A1D8}.Minimalist|x64.ActiveCfg = Minimalist|x64 - {47181A1D-C22C-4C9C-B4E0-CB6CE886A1D8}.Minimalist|x64.Build.0 = Minimalist|x64 {47181A1D-C22C-4C9C-B4E0-CB6CE886A1D8}.Release|x64.ActiveCfg = Release|x64 {47181A1D-C22C-4C9C-B4E0-CB6CE886A1D8}.Release|x64.Build.0 = Release|x64 EndGlobalSection diff --git a/source-code/source/PD-Loader/PD-Loader.vcxproj b/source-code/source/PD-Loader/PD-Loader.vcxproj index cecd320..2014c4c 100644 --- a/source-code/source/PD-Loader/PD-Loader.vcxproj +++ b/source-code/source/PD-Loader/PD-Loader.vcxproj @@ -5,10 +5,6 @@ Debug x64 - - Minimalist - x64 - Release x64 @@ -38,14 +34,6 @@ Unicode false - - DynamicLibrary - false - v142 - true - Unicode - false - @@ -57,9 +45,6 @@ - - - true @@ -69,10 +54,6 @@ false dnsapi - - false - dnsapi - NotUsing @@ -126,37 +107,6 @@ - - - NotUsing - Level3 - MaxSpeed - true - true - true - MINIMALIST;_CRT_SECURE_NO_WARNINGS;NDEBUG;PDLOADER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - pch.h - ..\..\dependencies\freeglut\include;..\..\dependencies\PluginConfigApi;..\..\dependencies\detours\include;..\..\dependencies\MemoryModule;%(AdditionalIncludeDirectories) - stdcpp17 - MultiThreadedDLL - -d2FH4- /utf-8 %(AdditionalOptions) - - - Windows - true - true - true - false - x64.def - -d2:-FH4- %(AdditionalOptions) - ..\..\dependencies\freeglut\lib;..\..\dependencies\detours\lib - - - - - - diff --git a/source-code/source/PD-Loader/Patches/PatchApplier710EX.h b/source-code/source/PD-Loader/Patches/PatchApplier710EX.h index 3d39373..ea43aa9 100644 --- a/source-code/source/PD-Loader/Patches/PatchApplier710EX.h +++ b/source-code/source/PD-Loader/Patches/PatchApplier710EX.h @@ -1,5 +1,4 @@ #pragma once -#ifndef MINIMALIST void ApplyExPatches() { //// Graphics @@ -304,7 +303,7 @@ void ApplyExPatches() { // modpack redirection - /*{ + { wchar_t* mpstr = NULL; mpstr = (wchar_t*)malloc(256); memset(mpstr, 0, 256); @@ -332,10 +331,5 @@ void ApplyExPatches() { InjectCode((void*)0x000000014066CE9C, { (unsigned char)modpack_mdata.size() }); InjectCode((void*)0x000000014066CEAE, { (unsigned char)modpack_mdata.size() }); } - }*/ -} -#else -void ApplyExPatches() { - return; -}; -#endif \ No newline at end of file + } +} \ No newline at end of file diff --git a/source-code/source/PD-Loader/Patches/patches-framework.h b/source-code/source/PD-Loader/Patches/patches-framework.h index d0731eb..4d738d0 100644 --- a/source-code/source/PD-Loader/Patches/patches-framework.h +++ b/source-code/source/PD-Loader/Patches/patches-framework.h @@ -105,7 +105,7 @@ auto nNoTimer = GetPrivateProfileIntW(L"patches", L"no_timer", TRUE, CONFIG_FILE auto nHardwareSlider = GetPrivateProfileIntW(L"patches", L"hardware_slider", FALSE, CONFIG_FILE); auto nDwguiScaling = GetPrivateProfileIntW(L"patches", L"dwgui_scaling", FALSE, CONFIG_FILE); -#ifndef MINIMALIST +// Non-essential auto nNoTimerSprite = GetPrivateProfileIntW(L"patches", L"no_timer_sprite", TRUE, CONFIG_FILE); auto nUnlockPseudo = GetPrivateProfileIntW(L"patches", L"unlock_pseudo", FALSE, CONFIG_FILE); auto nCard = GetPrivateProfileIntW(L"patches", L"card", TRUE, CONFIG_FILE); @@ -129,4 +129,3 @@ auto nRefractResHeight = GetPrivateProfileIntW(L"graphics", L"refract_res_height auto nNoMessageBar = GetPrivateProfileIntW(L"patches", L"no_message_bar", FALSE, CONFIG_FILE); auto nNoStageText = GetPrivateProfileIntW(L"patches", L"no_stage_text", FALSE, CONFIG_FILE); auto nNoOpd = GetPrivateProfileIntW(L"patches", L"no_opd", FALSE, CONFIG_FILE); -#endif diff --git a/source-code/source/PD-Loader/dllmain.cpp b/source-code/source/PD-Loader/dllmain.cpp index 17f3fbb..fd142b8 100644 --- a/source-code/source/PD-Loader/dllmain.cpp +++ b/source-code/source/PD-Loader/dllmain.cpp @@ -781,11 +781,9 @@ void Init() WritePrivateProfileStringW(L"global", L"pc", this_pcname, CONFIG_FILE); WritePrivateProfileStringW(L"plugins", L"Launcher.dva", L"1", CONFIG_FILE); WritePrivateProfileStringW(L"plugins", L"TLAC.dva", L"1", CONFIG_FILE); -#ifndef MINIMALIST WritePrivateProfileStringW(L"plugins", L"DivaSound.dva", L"1", CONFIG_FILE); WritePrivateProfileStringW(L"plugins", L"Novidia.dva", L"1", CONFIG_FILE); WritePrivateProfileStringW(L"plugins", L"ShaderPatch.dva", L"1", CONFIG_FILE); -#endif } const auto COMPONENTS = L"plugins\\components.ini"; if (!PathFileExistsW(COMPONENTS)) writeTemplate(components_template, COMPONENTS); diff --git a/source-code/source/PD-Loader/templates.h b/source-code/source/PD-Loader/templates.h index 0c0df2f..275f1e6 100644 --- a/source-code/source/PD-Loader/templates.h +++ b/source-code/source/PD-Loader/templates.h @@ -28,18 +28,14 @@ char config_template[] = "Skip=0\n" "# Disables unsupported GPU warning dialogs.\n" "No_GPU_Dialog=0\n" -#ifndef MINIMALIST "# Sets the dark colour scheme in the launcher.\n" "Dark_Launcher=0\n" -#endif "# Command line arguments\n" "Command_Line=\n" -#ifndef MINIMALIST "# Launches divahook.bat intead of diva.exe.\n" "Use_divahook_bat=0\n" "# Language -- 0=auto, 1=en, 2=zh-Hans, 3=pt-BR, 4=it-IT\n" "Launcher_Language=0\n" -#endif "\n" "[Patches]\n" "# Disable movies (enable this if the game hangs when loading certain PVs)\n" @@ -48,18 +44,14 @@ char config_template[] = "Cursor=1\n" "# Use 2 channels instead of 4 (when not using DivaSound)\n" "Stereo=1\n" -#ifndef MINIMALIST "# Skip one or more menus -- 0=disabled, 1=guest, 2=guest+normal\n" "Quick_Start=1\n" "# Disable the scrolling sound effect\n" "No_Scrolling_SFX=0\n" -#endif "# Show \"FREE PLAY\" instead of \"CREDIT(S)\" and don't require credits\n" "Freeplay=1\n" -#ifndef MINIMALIST "# Sing missed notes\n" "Sing_Missed=0\n" -#endif "# Hide the volume and SE control buttons\n" "Hide_Volume=0\n" "# Remove the photo controls during PV playback\n" @@ -78,7 +70,6 @@ char config_template[] = "PDLoaderText=1\n" "# Freeze the timer\n" "No_Timer=1\n" -#ifndef MINIMALIST "# Disable the timer sprite\n" "No_Timer_Sprite=1\n" "# Disable Message Bar\n" @@ -91,15 +82,12 @@ char config_template[] = "Card=0\n" "# Disable Extended Data (may break physics in some edits) AKA Skyth's no-opd patch\n" "No_Opd=0\n" -#endif "# Scale Debug Windows above HD internal resolution AKA somewhatlurker's dwgui patch\n" "Dwgui_Scaling=0\n" "# Allow using a real arcade slider attached to COM11 (or PS4 official FT controller)\n" "Hardware_Slider=0\n" -#ifndef MINIMALIST "# Prevent data deletion\n" "Prevent_Data_Deletion=0\n" -#endif "\n" "[Graphics]\n" "# Lag Compensation\n" @@ -115,7 +103,6 @@ char config_template[] = "TAA=1\n" "# Morphological Anti-Aliasing\n" "MLAA=1\n" -#ifndef MINIMALIST "# MAG Filter -- 0=default (bilinear), 1=nearest-neighbour, 2=sharpen, 3=cone (smooth)\n" "MAG=0\n" "# Depth of Field\n" @@ -140,7 +127,6 @@ char config_template[] = "NPR1=0\n" "# Disable all 3D passes. WARNING: The extended data will be deleted unless Prevent Data Deletion is enabled. Don't enable on Intel GPUs, enable no_opd instead.\n" "2D=0\n" -#endif "# FrameRateManager motion rate (fps)\n" "FRM.Motion.Rate=400\n" "\n" diff --git a/source-code/source/fakedll/fakedll.vcxproj b/source-code/source/fakedll/fakedll.vcxproj index 159ccef..6944db8 100644 --- a/source-code/source/fakedll/fakedll.vcxproj +++ b/source-code/source/fakedll/fakedll.vcxproj @@ -5,10 +5,6 @@ Debug x64 - - Minimalist - x64 - Release x64 @@ -38,14 +34,6 @@ Unicode false - - DynamicLibrary - false - v142 - true - Unicode - false - @@ -57,9 +45,6 @@ - - - true @@ -69,10 +54,6 @@ false fakednsapi - - false - fakednsapi - NotUsing @@ -120,32 +101,6 @@ -d2:-FH4- %(AdditionalOptions) - - - NotUsing - Level3 - MaxSpeed - true - true - true - MINIMALIST;_CRT_SECURE_NO_WARNINGS;NDEBUG;PDLOADER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - pch.h - ..\dependencies\MemoryModule;%(AdditionalIncludeDirectories) - stdcpp17 - MultiThreadedDLL - -d2FH4- /utf-8 %(AdditionalOptions) - - - Windows - true - true - true - false - x64.def - -d2:-FH4- %(AdditionalOptions) - - diff --git a/source-code/source/plugins/DSCRemote/DSCRemote.vcxproj b/source-code/source/plugins/DSCRemote/DSCRemote.vcxproj index 4fdb89f..fd6d48a 100644 --- a/source-code/source/plugins/DSCRemote/DSCRemote.vcxproj +++ b/source-code/source/plugins/DSCRemote/DSCRemote.vcxproj @@ -5,10 +5,6 @@ Debug x64 - - Minimalist - x64 - Release x64 @@ -34,13 +30,6 @@ true MultiByte - - DynamicLibrary - false - v142 - true - MultiByte - @@ -52,9 +41,6 @@ - - - .dva @@ -62,9 +48,6 @@ .dva - - .dva - Level3 @@ -104,30 +87,6 @@ -d2:-FH4- %(AdditionalOptions) - - - Level3 - MaxSpeed - true - true - true - true - ..\..\..\dependencies\detours\include;%(AdditionalIncludeDirectories) - MultiThreaded - -d2FH4- /utf-8 %(AdditionalOptions) - - - MINIMALIST;_WINDLL;%(PreprocessorDefinitions) - - - Console - true - true - detours.lib;evr.lib;mfplat.lib;mfuuid.lib;syelog.lib;%(AdditionalDependencies) - ..\..\..\dependencies\detours\lib;%(AdditionalLibraryDirectories) - -d2:-FH4- %(AdditionalOptions) - - diff --git a/source-code/source/plugins/DivaMovie/DivaMovie.vcxproj b/source-code/source/plugins/DivaMovie/DivaMovie.vcxproj index 3c9ae04..cc0317f 100644 --- a/source-code/source/plugins/DivaMovie/DivaMovie.vcxproj +++ b/source-code/source/plugins/DivaMovie/DivaMovie.vcxproj @@ -5,10 +5,6 @@ Debug x64 - - Minimalist - x64 - Release x64 @@ -34,13 +30,6 @@ true MultiByte - - DynamicLibrary - false - v142 - true - MultiByte - @@ -52,9 +41,6 @@ - - - .dva @@ -62,9 +48,6 @@ .dva - - .dva - Level3 @@ -102,28 +85,6 @@ -d2:-FH4- %(AdditionalOptions) - - - Level3 - MaxSpeed - true - true - true - true - ..\..\..\dependencies\detours\include;%(AdditionalIncludeDirectories) - MultiThreadedDLL - -d2FH4- /utf-8 %(AdditionalOptions) - MINIMALIST;_WINDLL;%(PreprocessorDefinitions) - - - Console - true - true - detours.lib;evr.lib;mfplat.lib;mfuuid.lib;syelog.lib;%(AdditionalDependencies) - ..\..\..\dependencies\detours\lib;%(AdditionalLibraryDirectories) - -d2:-FH4- %(AdditionalOptions) - - diff --git a/source-code/source/plugins/DivaSound/DivaSound.vcxproj b/source-code/source/plugins/DivaSound/DivaSound.vcxproj index 1b3336b..17f03ed 100644 --- a/source-code/source/plugins/DivaSound/DivaSound.vcxproj +++ b/source-code/source/plugins/DivaSound/DivaSound.vcxproj @@ -5,10 +5,6 @@ Debug x64 - - Minimalist - x64 - Release x64 @@ -34,13 +30,6 @@ MultiByte v142 - - DynamicLibrary - false - true - MultiByte - v142 - @@ -52,9 +41,6 @@ - - - .dva @@ -62,9 +48,6 @@ .dva - - .dva - Level3 @@ -99,27 +82,6 @@ -d2:-FH4- %(AdditionalOptions) - - - Level3 - MaxSpeed - true - true - true - stdcpp17 - ..\..\..\dependencies\PluginConfigApi;..\..\..\dependencies\detours\include;miniaudio;bassasio - MultiThreadedDLL - -d2FH4- /utf-8 %(AdditionalOptions) - MINIMALIST;_WINDLL;%(PreprocessorDefinitions) - - - true - true - detours.lib;syelog.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) - ..\..\..\dependencies\detours\lib;bassasio - -d2:-FH4- %(AdditionalOptions) - - diff --git a/source-code/source/plugins/DivaWig/DivaWig.vcxproj b/source-code/source/plugins/DivaWig/DivaWig.vcxproj index b91d393..3b22fff 100644 --- a/source-code/source/plugins/DivaWig/DivaWig.vcxproj +++ b/source-code/source/plugins/DivaWig/DivaWig.vcxproj @@ -5,10 +5,6 @@ Debug x64 - - Minimalist - x64 - Release x64 @@ -35,13 +31,6 @@ true MultiByte - - DynamicLibrary - false - v142 - true - MultiByte - @@ -53,9 +42,6 @@ - - - .dva @@ -63,9 +49,6 @@ .dva - - .dva - Level3 @@ -103,28 +86,6 @@ -d2:-FH4- %(AdditionalOptions) - - - Level3 - MaxSpeed - true - true - true - true - ..\..\..\dependencies\detours\include;%(AdditionalIncludeDirectories) - MultiThreadedDLL - -d2FH4- /utf-8 %(AdditionalOptions) - MINIMALIST;_WINDLL;%(PreprocessorDefinitions) - - - Console - true - true - detours.lib;evr.lib;mfplat.lib;mfuuid.lib;syelog.lib;%(AdditionalDependencies) - ..\..\..\dependencies\detours\lib;%(AdditionalLibraryDirectories) - -d2:-FH4- %(AdditionalOptions) - - diff --git a/source-code/source/plugins/EnhancedStageManager/EnhancedStageManager.vcxproj b/source-code/source/plugins/EnhancedStageManager/EnhancedStageManager.vcxproj index cee70d6..6e7aa6b 100644 --- a/source-code/source/plugins/EnhancedStageManager/EnhancedStageManager.vcxproj +++ b/source-code/source/plugins/EnhancedStageManager/EnhancedStageManager.vcxproj @@ -5,10 +5,6 @@ Debug x64 - - Minimalist - x64 - Release x64 @@ -34,13 +30,6 @@ true MultiByte - - DynamicLibrary - false - v142 - true - MultiByte - @@ -52,9 +41,6 @@ - - - .dva @@ -62,9 +48,6 @@ .dva - - .dva - Level3 @@ -102,28 +85,6 @@ -d2:-FH4- %(AdditionalOptions) - - - Level3 - MaxSpeed - true - true - true - true - %(AdditionalIncludeDirectories) - MultiThreadedDLL - -d2FH4- /utf-8 %(AdditionalOptions) - MINIMALIST;_WINDLL;%(PreprocessorDefinitions) - - - Console - true - true - %(AdditionalDependencies) - ..\..\..\dependencies\detours\lib;%(AdditionalLibraryDirectories) - -d2:-FH4- %(AdditionalOptions) - - diff --git a/source-code/source/plugins/Launcher/Launcher.vcxproj b/source-code/source/plugins/Launcher/Launcher.vcxproj index 9044002..1757bc3 100644 --- a/source-code/source/plugins/Launcher/Launcher.vcxproj +++ b/source-code/source/plugins/Launcher/Launcher.vcxproj @@ -5,10 +5,6 @@ Debug x64 - - Minimalist - x64 - Release x64 @@ -38,13 +34,6 @@ true Unicode - - DynamicLibrary - false - v142 - true - Unicode - @@ -56,9 +45,6 @@ - - - true @@ -69,11 +55,6 @@ .dva $(ProjectName) - - false - .dva - $(ProjectName) - NotUsing @@ -116,27 +97,6 @@ -d2:-FH4- %(AdditionalOptions) - - - NotUsing - - - Level3 - MINIMALIST;NDEBUG;%(PreprocessorDefinitions) - ..\..\..\dependencies\simpleini;..\..\..\dependencies\WineVer;..\..\..\dependencies\GPUModel;..\..\..\dependencies\PluginConfigApi;..\..\..\dependencies\freeglut\include;..\..\..\dependencies\detours\include;%(AdditionalIncludeDirectories) - stdcpp17 - MultiThreadedDLL - -d2FH4- /utf-8 %(AdditionalOptions) - - - User32.lib - Windows - - - ..\..\..\dependencies\detours\lib;..\..\..\dependencies\freeglut\lib;%(AdditionalLibraryDirectories) - -d2:-FH4- %(AdditionalOptions) - - diff --git a/source-code/source/plugins/Launcher/framework.h b/source-code/source/plugins/Launcher/framework.h index f5fe855..48d4518 100644 --- a/source-code/source/plugins/Launcher/framework.h +++ b/source-code/source/plugins/Launcher/framework.h @@ -65,9 +65,7 @@ LPCWSTR KEYCONFIG_SECTION = L"keyconfig"; int nSkipLauncher = GetPrivateProfileIntW(LAUNCHER_SECTION, L"skip", FALSE, CONFIG_FILE); int nNoGPUDialog = GetPrivateProfileIntW(LAUNCHER_SECTION, L"no_gpu_dialog", FALSE, CONFIG_FILE); -#ifndef MINIMALIST int nLanguage = GetPrivateProfileIntW(LAUNCHER_SECTION, L"launcher_language", FALSE, CONFIG_FILE); -#endif std::vector languages = std::vector({ L"LANG_AUTO", L"en", L"zh-Hans", L"pt-BR", L"it-IT"}); @@ -186,7 +184,6 @@ ConfigOptionBase* graphicsArray[] = { new DropdownOption(L"model", L"GPU", CONFIG_FILE, L"MODEL_NAME", L"MODEL_HINT", -1, std::vector({ L"MODEL_AUTOMATIC", L"Kepler", L"Maxwell", L"Turing", L"Ampere" }), -1), new BooleanOption(L"TAA", GRAPHICS_SECTION, CONFIG_FILE, L"TAA_NAME", L"TAA_HINT", true, false), new BooleanOption(L"MLAA", GRAPHICS_SECTION, CONFIG_FILE, L"MLAA_NAME", L"MLAA_HINT", true, false), -#ifndef MINIMALIST new DropdownOption(L"MAG", GRAPHICS_SECTION, CONFIG_FILE, L"MAG_NAME", L"MAG_HINT", 0, std::vector({ L"MAG_BILINEAR", L"MAG_NEAREST", L"MAG_SHARPEN", L"MAG_CONE" })), new BooleanOption(L"DOF", GRAPHICS_SECTION, CONFIG_FILE, L"DOF_NAME", L"DOF_HINT", true, false), new BooleanOption(L"reflections", GRAPHICS_SECTION, CONFIG_FILE, L"REFLECTIONS_NAME", L"REFLECTIONS_HINT", true, false), @@ -199,7 +196,6 @@ ConfigOptionBase* graphicsArray[] = { new BooleanOption(L"shader", GRAPHICS_SECTION, CONFIG_FILE, L"SHADER_NAME", L"SHADER_HINT", true, false), new DropdownOption(L"NPR1", GRAPHICS_SECTION, CONFIG_FILE, L"NPR1_NAME", L"NPR1_HINT", 0, std::vector({ L"Default", L"Force on", L"Force off" })), new BooleanOption(L"2D", GRAPHICS_SECTION, CONFIG_FILE, L"2D_NAME", L"2D_HINT", false, false), -#endif }; ConfigOptionBase* optionsArray[] = { @@ -213,10 +209,8 @@ ConfigOptionBase* optionsArray[] = { new OptionMetaSectionLabel(L"SECTION_COMPATIBILITY"), new BooleanOption(L"no_movies", PATCHES_SECTION, CONFIG_FILE, L"NO_MOVIES_NAME", L"NO_MOVIES_HINT", false, false), new BooleanOption(L"stereo", PATCHES_SECTION, CONFIG_FILE, L"STEREO_NAME", L"STEREO_HINT", true, false), -#ifndef MINIMALIST new BooleanOption(L"prevent_data_deletion", PATCHES_SECTION, CONFIG_FILE, L"PREVENT_DATA_DELETION_NAME", L"PREVENT_DATA_DELETION_HINT", false, false), new BooleanOption(L"no_opd", PATCHES_SECTION, CONFIG_FILE, L"NO_OPD_NAME", L"NO_OPD_HINT", false, false), -#endif new OptionMetaSeparator(), new OptionMetaSpacer(8), @@ -237,26 +231,20 @@ ConfigOptionBase* optionsArray[] = { new OptionMetaSpacer(8), new OptionMetaSectionLabel(L"SECTION_LAUNCHER"), -#ifndef MINIMALIST new DropdownOption(L"launcher_language",LAUNCHER_SECTION,CONFIG_FILE, L"LAUNCHER_LANGUAGE_NAME",L"LAUNCHER_LANGUAGE_HINT", 0, languages), new BooleanOption(L"dark_launcher", LAUNCHER_SECTION, CONFIG_FILE, L"DARK_LAUNCHER_NAME", L"DARK_LAUNCHER_HINT", false, false), //new BooleanOption(L"acrylic_blur", LAUNCHER_SECTION, CONFIG_FILE, L"ACRYLIC_BLUR_NAME", L"ACRYLIC_BLUR_HINT", false, false), -#endif new BooleanOption(L"no_gpu_dialog", LAUNCHER_SECTION, CONFIG_FILE, L"NO_GPU_DIALOG_NAME", L"NO_GPU_DIALOG_HINT", false, false), -#ifndef MINIMALIST new BooleanOption(L"use_divahook_bat", LAUNCHER_SECTION, CONFIG_FILE, L"USE_DIVAHOOK_BAT_NAME", L"USE_DIVAHOOK_BAT_HINT", false, false), -#endif new StringOption(L"command_line", LAUNCHER_SECTION, CONFIG_FILE, L"COMMAND_LINE_NAME", L"COMMAND_LINE_HINT", L"", false), }; ConfigOptionBase* options2Array[] = { new OptionMetaSectionLabel(L"SECTION_PV_SELECTOR"), new BooleanOption(L"freeplay", PATCHES_SECTION, CONFIG_FILE, L"FREEPLAY_NAME", L"FREEPLAY_HINT", true, false), -#ifndef MINIMALIST new DropdownOption(L"quick_start", PATCHES_SECTION, CONFIG_FILE, L"QUICK_START_NAME", L"QUICK_START_HINT", 1, std::vector({ L"Disabled", L"Guest", L"Guest + Normal" })), new BooleanOption(L"no_scrolling_sfx", PATCHES_SECTION, CONFIG_FILE, L"NO_SCROLLING_SFX_NAME", L"NO_SCROLLING_SFX_HINT", false, false), new BooleanOption(L"unlock_pseudo", PATCHES_SECTION, CONFIG_FILE, L"UNLOCK_PSEUDO_NAME", L"UNLOCK_PSEUDO_HINT", false, false), -#endif new OptionMetaSeparator(), new OptionMetaSpacer(8), @@ -276,12 +264,10 @@ ConfigOptionBase* options2Array[] = { new BooleanOption(L"hide_freeplay", PATCHES_SECTION, CONFIG_FILE, L"HIDE_FREEPLAY_NAME", L"HIDE_FREEPLAY_HINT", false, false), new BooleanOption(L"pdloadertext", PATCHES_SECTION, CONFIG_FILE, L"PDLOADERTEXT_NAME", L"PDLOADERTEXT_HINT", true, false), new BooleanOption(L"no_timer", PATCHES_SECTION, CONFIG_FILE, L"NO_TIMER_NAME", L"NO_TIMER_HINT", true, false), -#ifndef MINIMALIST new BooleanOption(L"no_timer_sprite", PATCHES_SECTION, CONFIG_FILE, L"NO_TIMER_SPRITE_NAME", L"NO_TIMER_SPRITE_HINT", true, false), new BooleanOption(L"no_message_bar", PATCHES_SECTION, CONFIG_FILE, L"NO_MESSAGE_BAR_NAME", L"NO_MESSAGE_BAR_HINT", false, false), new BooleanOption(L"no_stage_text", PATCHES_SECTION, CONFIG_FILE, L"NO_STAGE_TEXT_NAME", L"NO_STAGE_TEXT_HINT", false, false), new BooleanOption(L"card", PATCHES_SECTION, CONFIG_FILE, L"CARD_NAME", L"CARD_HINT", false, false), -#endif new BooleanOption(L"dwgui_scaling", PATCHES_SECTION, CONFIG_FILE, L"DWGUI_SCALING_NAME", L"DWGUI_SCALING_HINT", false, false), }; diff --git a/source-code/source/plugins/Launcher/ui.h b/source-code/source/plugins/Launcher/ui.h index 7cef9db..119fe20 100644 --- a/source-code/source/plugins/Launcher/ui.h +++ b/source-code/source/plugins/Launcher/ui.h @@ -36,9 +36,7 @@ namespace Launcher { public: ui(void) { -#ifndef MINIMALIST SetLanguage(); -#endif InitializeComponent(); @@ -230,10 +228,6 @@ namespace Launcher { updateLagCompMsec(); -#ifndef MINIMALIST - scanModpacks(); -#endif - int window = glutCreateWindow("glut"); // a context must be created to use glGetString glutHideWindow(); @@ -431,26 +425,21 @@ namespace Launcher { void updateStyle() { -#ifndef MINIMALIST int nDarkLauncher = GetPrivateProfileIntW(LAUNCHER_SECTION, L"dark_launcher", FALSE, CONFIG_FILE); //int nAcrylicLauncher = GetPrivateProfileIntW(LAUNCHER_SECTION, L"acrylic_blur", FALSE, CONFIG_FILE); -#endif //bool useAcrylic = nAcrylicLauncher && setBlur(hWnd, AccentState::ACCENT_ENABLE_ACRYLICBLURBEHIND); Color colourBg, colourBg2, colourFg; System::Windows::Forms::FlatStyle cbxStyle; -#ifndef MINIMALIST if (nDarkLauncher) { -#endif setDarkTheme(hWnd); colourFg = Color::White; colourBg = Color::FromArgb(255, 32, 32, 32); // tabControl colourBg2 = Color::FromArgb(255, 25, 25, 25); cbxStyle = System::Windows::Forms::FlatStyle::Flat; -#ifndef MINIMALIST } else { @@ -460,9 +449,6 @@ namespace Launcher { colourBg2 = Color::FromArgb(255, 242, 242, 242); cbxStyle = System::Windows::Forms::FlatStyle::System; } -#else - this->Text += (" - Minimalist Edition"); -#endif /*if (useAcrylic) { @@ -491,10 +477,6 @@ namespace Launcher { this->tabPage_Plugins->ForeColor = colourFg; this->tabPage_Components->BackColor = colourBg; this->tabPage_Components->ForeColor = colourFg; -#ifndef MINIMALIST - this->tabPage_Modpacks->BackColor = colourBg; - this->tabPage_Modpacks->ForeColor = colourFg; -#endif this->creditsTextBox->BackColor = colourBg; this->creditsTextBox->ForeColor = colourFg; this->tabPage_Update->BackColor = colourBg; @@ -534,13 +516,8 @@ namespace Launcher { SetBackCol(this->panel_Playerdata, colourBg, cbxStyle); SetBackCol(this->panel_Components, colourBg, cbxStyle); SetBackCol(this->panel_Plugins, colourBg, cbxStyle); - -#ifdef MINIMALIST - tabPage_Modpacks->Enabled = false; -#endif } -#ifndef MINIMALIST void updateLanguage() { int language = GetPrivateProfileIntW(LAUNCHER_SECTION, L"launcher_language", FALSE, CONFIG_FILE); if (nLanguage == language) @@ -553,9 +530,7 @@ namespace Launcher { this->InitializeComponent(); this->addOptions(); } -#endif -#ifndef MINIMALIST void SetLanguage() { if (nLanguage == 0) { Thread::CurrentThread->CurrentUICulture = gcnew CultureInfo(GetUserDefaultLCID()); @@ -563,7 +538,7 @@ namespace Launcher { Thread::CurrentThread->CurrentUICulture = CultureInfo::CreateSpecificCulture(gcnew String(languages[nLanguage])); } } -#endif + private: @@ -616,19 +591,6 @@ private: System::Windows::Forms::LinkLabel^ linkLabel_Help; private: System::Windows::Forms::LinkLabel^ linkLabel_Repo; private: System::Windows::Forms::CheckBox^ checkBox_nofsopt; -private: System::Windows::Forms::TabPage^ tabPage_Modpacks; -private: System::Windows::Forms::CheckBox^ checkBox_ModPatches; -private: System::Windows::Forms::Button^ button_ModDelete; - -private: System::Windows::Forms::Button^ button_ModClone; - -private: System::Windows::Forms::Button^ button_ModSetActive; -private: System::Windows::Forms::ListBox^ listBox_Mods; - -private: System::Windows::Forms::Button^ button_ModFiles; -private: System::Windows::Forms::Button^ button_ModRescan; -private: System::Windows::Forms::Button^ button_ModRename; - private: System::Windows::Forms::LinkLabel^ linkLabel_Console; private: System::Windows::Forms::Panel^ panel_Patches2; private: System::Windows::Forms::FlowLayoutPanel^ flowLayoutPanel1; @@ -696,15 +658,6 @@ private: System::Windows::Forms::FlowLayoutPanel^ flowLayoutPanel2; this->tabPage_Plugins = (gcnew System::Windows::Forms::TabPage()); this->panel_Custom = (gcnew System::Windows::Forms::Panel()); this->panel_Plugins = (gcnew System::Windows::Forms::Panel()); - this->tabPage_Modpacks = (gcnew System::Windows::Forms::TabPage()); - this->button_ModRename = (gcnew System::Windows::Forms::Button()); - this->button_ModRescan = (gcnew System::Windows::Forms::Button()); - this->button_ModFiles = (gcnew System::Windows::Forms::Button()); - this->checkBox_ModPatches = (gcnew System::Windows::Forms::CheckBox()); - this->button_ModDelete = (gcnew System::Windows::Forms::Button()); - this->button_ModClone = (gcnew System::Windows::Forms::Button()); - this->button_ModSetActive = (gcnew System::Windows::Forms::Button()); - this->listBox_Mods = (gcnew System::Windows::Forms::ListBox()); this->tabPage_Credits = (gcnew System::Windows::Forms::TabPage()); this->creditsTextBox = (gcnew System::Windows::Forms::TextBox()); this->tabPage_Update = (gcnew System::Windows::Forms::TabPage()); @@ -737,58 +690,38 @@ private: System::Windows::Forms::FlowLayoutPanel^ flowLayoutPanel2; this->tabPage_Playerdata->SuspendLayout(); this->tabPage_Components->SuspendLayout(); this->tabPage_Plugins->SuspendLayout(); - this->tabPage_Modpacks->SuspendLayout(); this->tabPage_Credits->SuspendLayout(); this->tabPage_Update->SuspendLayout(); this->flowLayoutPanel1->SuspendLayout(); this->SuspendLayout(); - // - // button_Launch - // this->button_Launch->BackColor = System::Drawing::Color::White; this->button_Launch->FlatAppearance->BorderColor = System::Drawing::SystemColors::Control; resources->ApplyResources(this->button_Launch, L"button_Launch"); this->button_Launch->Name = L"button_Launch"; this->button_Launch->UseVisualStyleBackColor = false; this->button_Launch->Click += gcnew System::EventHandler(this, &ui::Button_Launch_Click); - // - // groupBox_ScreenRes - // this->groupBox_ScreenRes->Controls->Add(this->panel_ScreenRes); this->groupBox_ScreenRes->FlatStyle = System::Windows::Forms::FlatStyle::Flat; resources->ApplyResources(this->groupBox_ScreenRes, L"groupBox_ScreenRes"); this->groupBox_ScreenRes->Name = L"groupBox_ScreenRes"; this->groupBox_ScreenRes->TabStop = false; - // - // panel_ScreenRes - // resources->ApplyResources(this->panel_ScreenRes, L"panel_ScreenRes"); this->panel_ScreenRes->Controls->Add(this->checkBox_nofsopt); this->panel_ScreenRes->Name = L"panel_ScreenRes"; - // - // checkBox_nofsopt - // resources->ApplyResources(this->checkBox_nofsopt, L"checkBox_nofsopt"); this->checkBox_nofsopt->Name = L"checkBox_nofsopt"; this->toolTip1->SetToolTip(this->checkBox_nofsopt, resources->GetString(L"checkBox_nofsopt.ToolTip")); this->checkBox_nofsopt->UseVisualStyleBackColor = true; - // - // tabControl - // this->tabControl->Controls->Add(this->tabPage_Resolution); this->tabControl->Controls->Add(this->tabPage_Patches); this->tabControl->Controls->Add(this->tabPage_Playerdata); this->tabControl->Controls->Add(this->tabPage_Components); this->tabControl->Controls->Add(this->tabPage_Plugins); - this->tabControl->Controls->Add(this->tabPage_Modpacks); this->tabControl->Controls->Add(this->tabPage_Credits); this->tabControl->Controls->Add(this->tabPage_Update); resources->ApplyResources(this->tabControl, L"tabControl"); this->tabControl->Name = L"tabControl"; this->tabControl->SelectedIndex = 0; - // - // tabPage_Resolution - // this->tabPage_Resolution->BackColor = System::Drawing::Color::White; resources->ApplyResources(this->tabPage_Resolution, L"tabPage_Resolution"); this->tabPage_Resolution->Controls->Add(this->groupBox_Lag); @@ -799,65 +732,38 @@ private: System::Windows::Forms::FlowLayoutPanel^ flowLayoutPanel2; this->tabPage_Resolution->ForeColor = System::Drawing::Color::FromArgb(static_cast(static_cast(64)), static_cast(static_cast(64)), static_cast(static_cast(64))); this->tabPage_Resolution->Name = L"tabPage_Resolution"; - // - // groupBox_Lag - // this->groupBox_Lag->Controls->Add(this->flowLayoutPanel2); this->groupBox_Lag->FlatStyle = System::Windows::Forms::FlatStyle::Flat; resources->ApplyResources(this->groupBox_Lag, L"groupBox_Lag"); this->groupBox_Lag->Name = L"groupBox_Lag"; this->groupBox_Lag->TabStop = false; - // - // flowLayoutPanel2 - // this->flowLayoutPanel2->Controls->Add(this->trackBar_LagCompensation); resources->ApplyResources(this->flowLayoutPanel2, L"flowLayoutPanel2"); this->flowLayoutPanel2->Name = L"flowLayoutPanel2"; - // - // trackBar_LagCompensation - // this->trackBar_LagCompensation->LargeChange = 1; resources->ApplyResources(this->trackBar_LagCompensation, L"trackBar_LagCompensation"); this->trackBar_LagCompensation->Maximum = 500; this->trackBar_LagCompensation->Name = L"trackBar_LagCompensation"; this->trackBar_LagCompensation->TickStyle = System::Windows::Forms::TickStyle::None; this->trackBar_LagCompensation->ValueChanged += gcnew System::EventHandler(this, &ui::trackBar_LagCompensation_ValueChanged); - // - // groupBox_Details - // this->groupBox_Details->Controls->Add(this->panel_Details); this->groupBox_Details->FlatStyle = System::Windows::Forms::FlatStyle::Flat; resources->ApplyResources(this->groupBox_Details, L"groupBox_Details"); this->groupBox_Details->Name = L"groupBox_Details"; this->groupBox_Details->TabStop = false; - // - // panel_Details - // resources->ApplyResources(this->panel_Details, L"panel_Details"); this->panel_Details->Name = L"panel_Details"; - // - // labelGPU - // resources->ApplyResources(this->labelGPU, L"labelGPU"); this->labelGPU->BackColor = System::Drawing::Color::Transparent; this->labelGPU->ForeColor = System::Drawing::Color::Black; this->labelGPU->Name = L"labelGPU"; - // - // groupBox_InternalRes - // this->groupBox_InternalRes->Controls->Add(this->panel_IntRes); this->groupBox_InternalRes->FlatStyle = System::Windows::Forms::FlatStyle::Flat; resources->ApplyResources(this->groupBox_InternalRes, L"groupBox_InternalRes"); this->groupBox_InternalRes->Name = L"groupBox_InternalRes"; this->groupBox_InternalRes->TabStop = false; - // - // panel_IntRes - // resources->ApplyResources(this->panel_IntRes, L"panel_IntRes"); this->panel_IntRes->Name = L"panel_IntRes"; - // - // tabPage_Patches - // this->tabPage_Patches->BackColor = System::Drawing::Color::White; this->tabPage_Patches->Controls->Add(this->panel_Patches2); this->tabPage_Patches->Controls->Add(this->panel_Patches); @@ -865,33 +771,18 @@ private: System::Windows::Forms::FlowLayoutPanel^ flowLayoutPanel2; static_cast(static_cast(64))); resources->ApplyResources(this->tabPage_Patches, L"tabPage_Patches"); this->tabPage_Patches->Name = L"tabPage_Patches"; - // - // panel_Patches2 - // resources->ApplyResources(this->panel_Patches2, L"panel_Patches2"); this->panel_Patches2->Name = L"panel_Patches2"; - // - // panel_Patches - // resources->ApplyResources(this->panel_Patches, L"panel_Patches"); this->panel_Patches->Name = L"panel_Patches"; - // - // tabPage_Playerdata - // this->tabPage_Playerdata->BackColor = System::Drawing::Color::White; this->tabPage_Playerdata->Controls->Add(this->panel_Playerdata); this->tabPage_Playerdata->ForeColor = System::Drawing::Color::FromArgb(static_cast(static_cast(64)), static_cast(static_cast(64)), static_cast(static_cast(64))); resources->ApplyResources(this->tabPage_Playerdata, L"tabPage_Playerdata"); this->tabPage_Playerdata->Name = L"tabPage_Playerdata"; - // - // panel_Playerdata - // resources->ApplyResources(this->panel_Playerdata, L"panel_Playerdata"); this->panel_Playerdata->Name = L"panel_Playerdata"; - // - // tabPage_Components - // this->tabPage_Components->BackColor = System::Drawing::Color::White; this->tabPage_Components->Controls->Add(this->linkLabel_Console); this->tabPage_Components->Controls->Add(this->panel_Components); @@ -899,21 +790,12 @@ private: System::Windows::Forms::FlowLayoutPanel^ flowLayoutPanel2; static_cast(static_cast(64)), static_cast(static_cast(64))); resources->ApplyResources(this->tabPage_Components, L"tabPage_Components"); this->tabPage_Components->Name = L"tabPage_Components"; - // - // linkLabel_Console - // resources->ApplyResources(this->linkLabel_Console, L"linkLabel_Console"); this->linkLabel_Console->Name = L"linkLabel_Console"; this->linkLabel_Console->TabStop = true; this->linkLabel_Console->LinkClicked += gcnew System::Windows::Forms::LinkLabelLinkClickedEventHandler(this, &ui::linkLabel_Console_LinkClicked); - // - // panel_Components - // resources->ApplyResources(this->panel_Components, L"panel_Components"); this->panel_Components->Name = L"panel_Components"; - // - // tabPage_Plugins - // this->tabPage_Plugins->BackColor = System::Drawing::Color::White; this->tabPage_Plugins->Controls->Add(this->panel_Custom); this->tabPage_Plugins->Controls->Add(this->panel_Plugins); @@ -921,107 +803,20 @@ private: System::Windows::Forms::FlowLayoutPanel^ flowLayoutPanel2; static_cast(static_cast(64))); resources->ApplyResources(this->tabPage_Plugins, L"tabPage_Plugins"); this->tabPage_Plugins->Name = L"tabPage_Plugins"; - // - // panel_Custom - // resources->ApplyResources(this->panel_Custom, L"panel_Custom"); this->panel_Custom->Name = L"panel_Custom"; - // - // panel_Plugins - // resources->ApplyResources(this->panel_Plugins, L"panel_Plugins"); this->panel_Plugins->Name = L"panel_Plugins"; - // - // tabPage_Modpacks - // - this->tabPage_Modpacks->Controls->Add(this->button_ModRename); - this->tabPage_Modpacks->Controls->Add(this->button_ModRescan); - this->tabPage_Modpacks->Controls->Add(this->button_ModFiles); - this->tabPage_Modpacks->Controls->Add(this->checkBox_ModPatches); - this->tabPage_Modpacks->Controls->Add(this->button_ModDelete); - this->tabPage_Modpacks->Controls->Add(this->button_ModClone); - this->tabPage_Modpacks->Controls->Add(this->button_ModSetActive); - this->tabPage_Modpacks->Controls->Add(this->listBox_Mods); - resources->ApplyResources(this->tabPage_Modpacks, L"tabPage_Modpacks"); - this->tabPage_Modpacks->Name = L"tabPage_Modpacks"; - this->tabPage_Modpacks->UseVisualStyleBackColor = true; - this->tabPage_Modpacks->Enter += gcnew System::EventHandler(this, &ui::tabPage_Modpacks_Enter); - // - // button_ModRename - // - resources->ApplyResources(this->button_ModRename, L"button_ModRename"); - this->button_ModRename->Name = L"button_ModRename"; - this->button_ModRename->UseVisualStyleBackColor = true; - this->button_ModRename->Click += gcnew System::EventHandler(this, &ui::button_ModRename_Click); - // - // button_ModRescan - // - resources->ApplyResources(this->button_ModRescan, L"button_ModRescan"); - this->button_ModRescan->Name = L"button_ModRescan"; - this->button_ModRescan->UseVisualStyleBackColor = true; - this->button_ModRescan->Click += gcnew System::EventHandler(this, &ui::button_ModRescan_Click); - // - // button_ModFiles - // - resources->ApplyResources(this->button_ModFiles, L"button_ModFiles"); - this->button_ModFiles->Name = L"button_ModFiles"; - this->button_ModFiles->UseVisualStyleBackColor = true; - this->button_ModFiles->Click += gcnew System::EventHandler(this, &ui::button_ModFiles_Click); - // - // checkBox_ModPatches - // - resources->ApplyResources(this->checkBox_ModPatches, L"checkBox_ModPatches"); - this->checkBox_ModPatches->Checked = true; - this->checkBox_ModPatches->CheckState = System::Windows::Forms::CheckState::Checked; - this->checkBox_ModPatches->Name = L"checkBox_ModPatches"; - this->checkBox_ModPatches->UseVisualStyleBackColor = true; - // - // button_ModDelete - // - resources->ApplyResources(this->button_ModDelete, L"button_ModDelete"); - this->button_ModDelete->Name = L"button_ModDelete"; - this->button_ModDelete->UseVisualStyleBackColor = true; - this->button_ModDelete->Click += gcnew System::EventHandler(this, &ui::button_ModDelete_Click); - // - // button_ModClone - // - resources->ApplyResources(this->button_ModClone, L"button_ModClone"); - this->button_ModClone->Name = L"button_ModClone"; - this->button_ModClone->UseVisualStyleBackColor = true; - this->button_ModClone->Click += gcnew System::EventHandler(this, &ui::button_ModClone_Click); - // - // button_ModSetActive - // - resources->ApplyResources(this->button_ModSetActive, L"button_ModSetActive"); - this->button_ModSetActive->Name = L"button_ModSetActive"; - this->button_ModSetActive->UseVisualStyleBackColor = true; - this->button_ModSetActive->Click += gcnew System::EventHandler(this, &ui::button_ModSetActive_Click); - // - // listBox_Mods - // - this->listBox_Mods->FormattingEnabled = true; - resources->ApplyResources(this->listBox_Mods, L"listBox_Mods"); - this->listBox_Mods->Name = L"listBox_Mods"; - this->listBox_Mods->SelectedValueChanged += gcnew System::EventHandler(this, &ui::listBox_Mods_SelectedValueChanged); - // - // tabPage_Credits - // this->tabPage_Credits->Controls->Add(this->creditsTextBox); resources->ApplyResources(this->tabPage_Credits, L"tabPage_Credits"); this->tabPage_Credits->Name = L"tabPage_Credits"; this->tabPage_Credits->UseVisualStyleBackColor = true; - // - // creditsTextBox - // this->creditsTextBox->BackColor = System::Drawing::Color::White; this->creditsTextBox->ForeColor = System::Drawing::Color::FromArgb(static_cast(static_cast(64)), static_cast(static_cast(64)), static_cast(static_cast(64))); resources->ApplyResources(this->creditsTextBox, L"creditsTextBox"); this->creditsTextBox->Name = L"creditsTextBox"; this->creditsTextBox->ReadOnly = true; - // - // tabPage_Update - // this->tabPage_Update->Controls->Add(this->flowLayoutPanel1); this->tabPage_Update->Controls->Add(this->linkLabel_Repo); this->tabPage_Update->Controls->Add(this->linkLabel_Help); @@ -1034,83 +829,47 @@ private: System::Windows::Forms::FlowLayoutPanel^ flowLayoutPanel2; resources->ApplyResources(this->tabPage_Update, L"tabPage_Update"); this->tabPage_Update->Name = L"tabPage_Update"; this->tabPage_Update->UseVisualStyleBackColor = true; - // - // flowLayoutPanel1 - // this->flowLayoutPanel1->Controls->Add(this->label_Update_1); this->flowLayoutPanel1->Controls->Add(this->label_Update_2); resources->ApplyResources(this->flowLayoutPanel1, L"flowLayoutPanel1"); this->flowLayoutPanel1->Name = L"flowLayoutPanel1"; - // - // label_Update_1 - // resources->ApplyResources(this->label_Update_1, L"label_Update_1"); this->label_Update_1->Name = L"label_Update_1"; this->label_Update_1->Click += gcnew System::EventHandler(this, &ui::label_Update_1_Click); - // - // label_Update_2 - // resources->ApplyResources(this->label_Update_2, L"label_Update_2"); this->label_Update_2->Name = L"label_Update_2"; - // - // linkLabel_Repo - // resources->ApplyResources(this->linkLabel_Repo, L"linkLabel_Repo"); this->linkLabel_Repo->Name = L"linkLabel_Repo"; this->linkLabel_Repo->TabStop = true; this->linkLabel_Repo->LinkClicked += gcnew System::Windows::Forms::LinkLabelLinkClickedEventHandler(this, &ui::linkLabel_Repo_LinkClicked); - // - // linkLabel_Help - // resources->ApplyResources(this->linkLabel_Help, L"linkLabel_Help"); this->linkLabel_Help->Name = L"linkLabel_Help"; this->linkLabel_Help->TabStop = true; this->linkLabel_Help->LinkClicked += gcnew System::Windows::Forms::LinkLabelLinkClickedEventHandler(this, &ui::linkLabel_Help_LinkClicked); - // - // linkLabel_Official_Discord - // resources->ApplyResources(this->linkLabel_Official_Discord, L"linkLabel_Official_Discord"); this->linkLabel_Official_Discord->Name = L"linkLabel_Official_Discord"; this->linkLabel_Official_Discord->TabStop = true; this->linkLabel_Official_Discord->LinkClicked += gcnew System::Windows::Forms::LinkLabelLinkClickedEventHandler(this, &ui::linkLabel_Official_Discord_LinkClicked); - // - // linkLabel_Changelog - // resources->ApplyResources(this->linkLabel_Changelog, L"linkLabel_Changelog"); this->linkLabel_Changelog->Name = L"linkLabel_Changelog"; this->linkLabel_Changelog->TabStop = true; this->linkLabel_Changelog->LinkClicked += gcnew System::Windows::Forms::LinkLabelLinkClickedEventHandler(this, &ui::linkLabel_Changelog_LinkClicked); - // - // button_Clean_installation - // resources->ApplyResources(this->button_Clean_installation, L"button_Clean_installation"); this->button_Clean_installation->Name = L"button_Clean_installation"; this->button_Clean_installation->UseVisualStyleBackColor = true; this->button_Clean_installation->Click += gcnew System::EventHandler(this, &ui::button_Clean_installation_Click); - // - // button_Instructions - // resources->ApplyResources(this->button_Instructions, L"button_Instructions"); this->button_Instructions->Name = L"button_Instructions"; this->button_Instructions->UseVisualStyleBackColor = true; this->button_Instructions->Click += gcnew System::EventHandler(this, &ui::button_Instructions_Click); - // - // button_Unstable_builds - // resources->ApplyResources(this->button_Unstable_builds, L"button_Unstable_builds"); this->button_Unstable_builds->Name = L"button_Unstable_builds"; this->button_Unstable_builds->UseVisualStyleBackColor = true; this->button_Unstable_builds->Click += gcnew System::EventHandler(this, &ui::button_Unstable_builds_Click); - // - // button_Releases_page - // resources->ApplyResources(this->button_Releases_page, L"button_Releases_page"); this->button_Releases_page->Name = L"button_Releases_page"; this->button_Releases_page->UseVisualStyleBackColor = true; this->button_Releases_page->Click += gcnew System::EventHandler(this, &ui::button_Releases_page_Click); - // - // button_Discord - // this->button_Discord->BackColor = System::Drawing::Color::FromArgb(static_cast(static_cast(242)), static_cast(static_cast(242)), static_cast(static_cast(242))); this->button_Discord->Cursor = System::Windows::Forms::Cursors::Hand; @@ -1119,9 +878,6 @@ private: System::Windows::Forms::FlowLayoutPanel^ flowLayoutPanel2; this->button_Discord->Name = L"button_Discord"; this->button_Discord->UseVisualStyleBackColor = false; this->button_Discord->Click += gcnew System::EventHandler(this, &ui::button_Discord_Click); - // - // button_github - // this->button_github->BackColor = System::Drawing::Color::FromArgb(static_cast(static_cast(242)), static_cast(static_cast(242)), static_cast(static_cast(242))); this->button_github->Cursor = System::Windows::Forms::Cursors::Hand; @@ -1130,18 +886,12 @@ private: System::Windows::Forms::FlowLayoutPanel^ flowLayoutPanel2; this->button_github->Name = L"button_github"; this->button_github->UseVisualStyleBackColor = false; this->button_github->Click += gcnew System::EventHandler(this, &ui::button_github_Click); - // - // button_Apply - // this->button_Apply->BackColor = System::Drawing::Color::White; this->button_Apply->FlatAppearance->BorderColor = System::Drawing::SystemColors::Control; resources->ApplyResources(this->button_Apply, L"button_Apply"); this->button_Apply->Name = L"button_Apply"; this->button_Apply->UseVisualStyleBackColor = false; this->button_Apply->Click += gcnew System::EventHandler(this, &ui::button_Apply_Click); - // - // button_Wiki - // this->button_Wiki->BackColor = System::Drawing::Color::FromArgb(static_cast(static_cast(242)), static_cast(static_cast(242)), static_cast(static_cast(242))); resources->ApplyResources(this->button_Wiki, L"button_Wiki"); @@ -1149,10 +899,6 @@ private: System::Windows::Forms::FlowLayoutPanel^ flowLayoutPanel2; this->button_Wiki->FlatAppearance->BorderSize = 0; this->button_Wiki->Name = L"button_Wiki"; this->button_Wiki->UseVisualStyleBackColor = false; - this->button_Wiki->Click += gcnew System::EventHandler(this, &ui::button_Wiki_Click); - // - // ui - // this->AcceptButton = this->button_Launch; resources->ApplyResources(this, L"$this"); this->AutoScaleMode = System::Windows::Forms::AutoScaleMode::Dpi; @@ -1191,8 +937,6 @@ private: System::Windows::Forms::FlowLayoutPanel^ flowLayoutPanel2; this->tabPage_Components->ResumeLayout(false); this->tabPage_Components->PerformLayout(); this->tabPage_Plugins->ResumeLayout(false); - this->tabPage_Modpacks->ResumeLayout(false); - this->tabPage_Modpacks->PerformLayout(); this->tabPage_Credits->ResumeLayout(false); this->tabPage_Credits->PerformLayout(); this->tabPage_Update->ResumeLayout(false); @@ -1203,28 +947,6 @@ private: System::Windows::Forms::FlowLayoutPanel^ flowLayoutPanel2; } #pragma endregion - private: System::Void scanModpacks() { - button_ModSetActive->Enabled = false; - button_ModClone->Enabled = false; - button_ModDelete->Enabled = false; - button_ModFiles->Enabled = false; - button_ModRename->Enabled = false; - listBox_Mods->Items->Clear(); - listBox_Mods->Items->Add("(base)"); - try { - for (std::filesystem::path p : std::filesystem::directory_iterator("./modpacks")) - { - if (std::filesystem::exists(p.string() + "/ram") && std::filesystem::exists(p.string() + "/mdata") && - std::filesystem::exists(p.string() + "/plugins") && std::filesystem::exists(p.string() + "/patches")) - { - listBox_Mods->Items->Add(gcnew String(p.filename().c_str())); - } - } - } - catch (const std::filesystem::filesystem_error& e) { - std::cout << "[Launcher] File system error " << e.what() << " " << e.path1() << " " << e.path2() << " " << e.code() << std::endl; - } - } private: System::Void SaveSettings() { if (*ResolutionConfigChanged) { @@ -1523,47 +1245,6 @@ private: System::Void linkLabel_Console_LinkClicked(System::Object^ sender, Syst ShowWindow(consoleHandle, SW_SHOW); linkLabel_Console->Visible = false; } -private: System::Void listBox_Mods_SelectedValueChanged(System::Object^ sender, System::EventArgs^ e) { - button_ModSetActive->Enabled = true; - button_ModClone->Enabled = true; - button_ModDelete->Enabled = true; - button_ModFiles->Enabled = true; - button_ModRename->Enabled = true; -} -private: System::Void button_ModRescan_Click(System::Object^ sender, System::EventArgs^ e) { - scanModpacks(); -} -private: System::Void button_ModSetActive_Click(System::Object^ sender, System::EventArgs^ e) { - LPCWSTR mpname; - if (listBox_Mods->SelectedIndex == 0) mpname = L""; - else - { - auto str = listBox_Mods->GetItemText(listBox_Mods->SelectedItem); - IntPtr strptr = System::Runtime::InteropServices::Marshal::StringToHGlobalUni(str); - mpname = (LPCWSTR)strptr.ToPointer(); - } - WritePrivateProfileStringW(L"Mods", L"Modpack", mpname, CONFIG_FILE); -} -private: System::Void button_ModFiles_Click(System::Object^ sender, System::EventArgs^ e) { - auto mpstr = listBox_Mods->SelectedItem->ToString(); - if(mpstr == "(base)") System::Diagnostics::Process::Start("."); - else System::Diagnostics::Process::Start("modpacks\\"+mpstr); -} -private: System::Void button_ModClone_Click(System::Object^ sender, System::EventArgs^ e) { -} -private: System::Void button_ModDelete_Click(System::Object^ sender, System::EventArgs^ e) { -} -private: System::Void button_ModRename_Click(System::Object^ sender, System::EventArgs^ e) { -} -private: System::Void tabPage_Modpacks_Enter(System::Object^ sender, System::EventArgs^ e) { - scanModpacks(); - wchar_t* mpstr = NULL; - mpstr = (wchar_t*)malloc(256); - memset(mpstr, 0, 256); - GetPrivateProfileStringW(L"Mods", L"Modpack", L"", mpstr, 256, CONFIG_FILE); - listBox_Mods->SelectedIndex = listBox_Mods->FindString(gcnew String(mpstr)); - free(mpstr); -} private: System::Void label_Update_1_Click(System::Object^ sender, System::EventArgs^ e) { } }; diff --git a/source-code/source/plugins/Launcher/ui.resx b/source-code/source/plugins/Launcher/ui.resx index d346ade..bf7d1e3 100644 --- a/source-code/source/plugins/Launcher/ui.resx +++ b/source-code/source/plugins/Launcher/ui.resx @@ -813,273 +813,6 @@ 4 - - False - - - 558, 707 - - - 5, 5, 5, 5 - - - 130, 42 - - - 8 - - - Rename - - - button_ModRename - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage_Modpacks - - - 0 - - - 696, 707 - - - 5, 5, 5, 5 - - - 130, 42 - - - 7 - - - Rescan - - - button_ModRescan - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage_Modpacks - - - 1 - - - False - - - 146, 707 - - - 5, 5, 5, 5 - - - 130, 42 - - - 6 - - - Files... - - - button_ModFiles - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage_Modpacks - - - 2 - - - True - - - False - - - 859, 715 - - - 5, 5, 5, 5 - - - 241, 29 - - - 5 - - - Plugins and Patches - - - checkBox_ModPatches - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage_Modpacks - - - 3 - - - False - - - 422, 707 - - - 5, 5, 5, 5 - - - 130, 42 - - - 4 - - - Delete - - - button_ModDelete - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage_Modpacks - - - 4 - - - False - - - 283, 707 - - - 5, 5, 5, 5 - - - 130, 42 - - - 3 - - - New/Clone - - - button_ModClone - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage_Modpacks - - - 5 - - - False - - - 10, 707 - - - 5, 5, 5, 5 - - - 130, 42 - - - 2 - - - Set Active - - - button_ModSetActive - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage_Modpacks - - - 6 - - - 25 - - - 10, 10 - - - 5, 5, 5, 5 - - - 1087, 679 - - - 0 - - - listBox_Mods - - - System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage_Modpacks - - - 7 - - - 8, 39 - - - 5, 5, 5, 5 - - - 5, 5, 5, 5 - - - 1104, 761 - - - 7 - - - Modpacks - - - tabPage_Modpacks - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 5 - 0, 0 @@ -1256,7 +989,7 @@ AMD compatibilty pack dependencies have additional licenses, detailed in the AMD tabControl - 6 + 5 Top, Bottom, Left, Right @@ -1617,7 +1350,7 @@ If you have downloaded PD Loader from a third-party, it is recommended to do a c tabControl - 7 + 6 0, 0 diff --git a/source-code/source/plugins/Novidia/Novidia.vcxproj b/source-code/source/plugins/Novidia/Novidia.vcxproj index 9198abd..bc98675 100644 --- a/source-code/source/plugins/Novidia/Novidia.vcxproj +++ b/source-code/source/plugins/Novidia/Novidia.vcxproj @@ -5,10 +5,6 @@ Debug x64 - - Minimalist - x64 - Release x64 @@ -35,13 +31,6 @@ true Unicode - - DynamicLibrary - false - v142 - true - Unicode - @@ -53,9 +42,6 @@ - - - true @@ -65,10 +51,6 @@ false .dva - - false - .dva - Level3 @@ -105,26 +87,6 @@ opengl32.lib;detours.lib;syelog.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 - MINIMALIST;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - ..\..\..\dependencies\GPUModel;..\..\..\dependencies\xdelta3;..\..\..\dependencies\PluginConfigApi;..\..\..\dependencies\detours\include; - -d2FH4- /utf-8 %(AdditionalOptions) - - - Console - true - true - true - ..\..\..\dependencies\detours\lib;%(AdditionalLibraryDirectories) - opengl32.lib;detours.lib;syelog.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) - - diff --git a/source-code/source/plugins/ShaderPatch/ShaderPatch.vcxproj b/source-code/source/plugins/ShaderPatch/ShaderPatch.vcxproj index 97c8855..e8df705 100644 --- a/source-code/source/plugins/ShaderPatch/ShaderPatch.vcxproj +++ b/source-code/source/plugins/ShaderPatch/ShaderPatch.vcxproj @@ -5,10 +5,6 @@ Debug x64 - - Minimalist - x64 - Release x64 @@ -33,13 +29,6 @@ true MultiByte - - DynamicLibrary - false - v142 - true - MultiByte - @@ -51,9 +40,6 @@ - - - .dva @@ -61,9 +47,6 @@ .dva - - .dva - Level3 @@ -95,25 +78,6 @@ -d2:-FH4- %(AdditionalOptions) - - - Level3 - MaxSpeed - true - true - true - ..\..\..\dependencies\GPUModel;..\..\..\dependencies\detours\include;..\..\..\dependencies\PluginConfigApi - MultiThreadedDLL - -d2FH4- /utf-8 %(AdditionalOptions) - MINIMALIST;_WINDLL;%(PreprocessorDefinitions) - - - true - true - ..\..\..\dependencies\detours\lib - -d2:-FH4- %(AdditionalOptions) - - diff --git a/source-code/source/plugins/TLAC/TLAC.vcxproj b/source-code/source/plugins/TLAC/TLAC.vcxproj index d25d637..4209e81 100644 --- a/source-code/source/plugins/TLAC/TLAC.vcxproj +++ b/source-code/source/plugins/TLAC/TLAC.vcxproj @@ -5,10 +5,6 @@ Debug x64 - - Minimalist - x64 - Release x64 @@ -35,13 +31,6 @@ true Unicode - - DynamicLibrary - false - v142 - true - Unicode - @@ -53,20 +42,12 @@ - - - false $(ProjectName) .dva - - false - $(ProjectName) - .dva - true $(ProjectName) @@ -101,35 +82,6 @@ -d2:-FH4- %(AdditionalOptions) - - - NotUsing - Level3 - MaxSpeed - true - true - true - MINIMALIST;NDEBUG;TLAC_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - - - stdcpp17 - ..\..\..\dependencies\PluginConfigApi;..\..\..\dependencies\detours\include;..\..\..\dependencies\freeglut\include;%(AdditionalIncludeDirectories) - MultiThreadedDLL - -d2FH4- /utf-8 %(AdditionalOptions) - - - Windows - true - true - true - false - XINPUT9_1_0.LIB;dinput8.lib;dxguid.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) - Xinput.h - ..\..\..\dependencies\detours\lib;..\..\..\dependencies\freeglut\lib;%(AdditionalLibraryDirectories) - -d2:-FH4- %(AdditionalOptions) - - NotUsing