diff --git a/.gitignore b/.gitignore index dba313b..fae6bb3 100644 --- a/.gitignore +++ b/.gitignore @@ -346,7 +346,13 @@ !/FMODAPI/Assets/x64 !/Qwilight/Assets/ARM64 +/Qwilight/Assets/ARM64/Flint.exe +/Qwilight/Assets/ARM64/NVIDIA.dll +/Qwilight/Assets/ARM64/Xwindow.exe !/Qwilight/Assets/x64 +/Qwilight/Assets/x64/Flint.exe +/Qwilight/Assets/x64/NVIDIA.dll +/Qwilight/Assets/x64/Xwindow.exe /Language/Assets/Client.json diff --git a/CI.cmd b/CI.cmd new file mode 100644 index 0000000..f115cbd --- /dev/null +++ b/CI.cmd @@ -0,0 +1,23 @@ +@ECHO OFF + +SET VS2022=%PROGRAMFILES%\Microsoft Visual Studio\2022\Community +SET MSBUILD=%VS2022%\Msbuild\Current\Bin\MSBuild.exe + +"%MSBUILD%" -t:Build -p:Configuration=Release,Platform=x64 Flint\Flint.vcxproj +Robocopy Flint\x64\Release Qwilight\Assets\x64 Flint.exe +"%MSBUILD%" -t:Build -p:Configuration=Release,Platform=ARM64 Flint\Flint.vcxproj +Robocopy Flint\ARM64\Release Qwilight\Assets\ARM64 Flint.exe + +"%MSBUILD%" -t:Build -p:Configuration=Release,Platform=x64 Igniter\Igniter.csproj +Robocopy Igniter\bin\x64\Release Qwilight\Assets\x64 Igniter.exe + +"%MSBUILD%" -t:Build -p:Configuration=Release,Platform=x64 NVIDIA\NVIDIA.vcxproj +Robocopy NVIDIA\x64\Release Qwilight\Assets\x64 NVIDIA.dll + +"%MSBUILD%" -t:Build -p:Configuration=Release,Platform=x64 Xwindow\Xwindow.vcxproj +Robocopy Xwindow\x64\Release Qwilight\Assets\x64 Xwindow.exe +"%MSBUILD%" -t:Build -p:Configuration=Release,Platform=ARM64 Xwindow\Xwindow.vcxproj +Robocopy Xwindow\ARM64\Release Qwilight\Assets\ARM64 Xwindow.exe + +dotnet build Language\Language.csproj -c Release -p:Platform=x64 +Language\bin\x64\Release\net7.0\Language.exe Qwilight\Assets\Language.json ..\..\..\IdeaProjects\Twilight\src\main\resources\Language.json ..\taehui\qwilight-fe\src\Language.json ..\taehui\taehui-fe\src\Language.json Qwilight\Qwilight\System\LanguageSystem\LanguageSystem.g.cs diff --git a/Qwilight.cmd b/Qwilight.cmd index d2cf495..e93957c 100644 --- a/Qwilight.cmd +++ b/Qwilight.cmd @@ -9,6 +9,8 @@ SET PUBLISH=Qwilight\%WIN10X64%\publish DEL Qwilight.zip + +CALL CI CHOICE /M TEST SET TEST=%ERRORLEVEL% diff --git a/Qwilight/Qwilight.csproj b/Qwilight/Qwilight.csproj index 2f2bb37..3feb6fe 100644 --- a/Qwilight/Qwilight.csproj +++ b/Qwilight/Qwilight.csproj @@ -282,10 +282,6 @@ - - Always - Content - Always @@ -293,14 +289,6 @@ False - - Always - Content - - - Always - Content - diff --git a/Qwilight/System/XwindowSystem.cs b/Qwilight/System/XwindowSystem.cs index a1ef6d8..6702cef 100644 --- a/Qwilight/System/XwindowSystem.cs +++ b/Qwilight/System/XwindowSystem.cs @@ -13,7 +13,7 @@ { try { - _exe = Process.Start(Path.Combine(AppContext.BaseDirectory, "Xwindow.exe"), $"\"{PIDClass.FilePath}\""); + _exe = Process.Start(Path.Combine(QwilightComponent.CPUAssetsEntryPath, "Xwindow.exe"), $"\"{PIDClass.FilePath}\""); } catch { diff --git a/Qwilight/View/QwilightClass.xaml.cs b/Qwilight/View/QwilightClass.xaml.cs index 0ecb194..07d7205 100644 --- a/Qwilight/View/QwilightClass.xaml.cs +++ b/Qwilight/View/QwilightClass.xaml.cs @@ -147,6 +147,7 @@ Utility.CopyFile(Path.Combine(QwilightComponent.CPUAssetsEntryPath, "sl.common.dll"), Path.Combine(AppContext.BaseDirectory, "sl.common.dll")); Utility.CopyFile(Path.Combine(QwilightComponent.CPUAssetsEntryPath, "sl.interposer.dll"), Path.Combine(AppContext.BaseDirectory, "sl.interposer.dll")); Utility.CopyFile(Path.Combine(QwilightComponent.CPUAssetsEntryPath, "sl.reflex.dll"), Path.Combine(AppContext.BaseDirectory, "sl.reflex.dll")); + Utility.CopyFile(Path.Combine(QwilightComponent.CPUAssetsEntryPath, "NVIDIA.dll"), Path.Combine(AppContext.BaseDirectory, "NVIDIA.dll")); Utility.CopyFile(Path.Combine(QwilightComponent.CPUAssetsEntryPath, "CChromaEditorLibrary64.dll"), Path.Combine(AppContext.BaseDirectory, "CChromaEditorLibrary64.dll")); diff --git a/Qwilight/ViewModel/NoteFileViewModel.cs b/Qwilight/ViewModel/NoteFileViewModel.cs index ae00493..8e7d925 100644 --- a/Qwilight/ViewModel/NoteFileViewModel.cs +++ b/Qwilight/ViewModel/NoteFileViewModel.cs @@ -83,7 +83,7 @@ { try { - var flintFilePath = Path.Combine(AppContext.BaseDirectory, "Flint.exe"); + var flintFilePath = Path.Combine(QwilightComponent.CPUAssetsEntryPath, "Flint.exe"); var noteFilePath = noteFile.NoteFilePath; if (QwilightComponent.BMSNoteFileFormats.Any(format => noteFilePath.IsTailCaselsss(format))) {