diff --git a/appveyor.yml b/appveyor.yml index a31688e3..eb79b61f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,17 +9,19 @@ branches: skip_branch_with_pr: true environment: - PJ64PluginsDirQT: C:\projects\gliden64\build\GLideN64-QT_for_Project64\ - PJ64PluginsDirQT_x64: C:\projects\gliden64\build\GLideN64-QT_for_Project64_x64\ - PJ64PluginsDirWTL: C:\projects\gliden64\build\GLideN64-WTL_for_Project64\ - PJ64PluginsDirWTL_x64: C:\projects\gliden64\build\GLideN64-WTL_for_Project64_x64\ - Mupen64PluginsDir: C:\projects\gliden64\build\GLideN64_for_Mupen64Plus\ - Mupen64PluginsDir_x64: C:\projects\gliden64\build\GLideN64_for_Mupen64Plus_x64\ + BUILD_PATH: $(APPVEYOR_BUILD_FOLDER)\build QTDIR_x86: C:\Static_Qt_x86 QTDIR_x64: C:\Static_Qt_x64 QT_BUILD_BASE_URL: https://github.com/gonetz/GLideN64/releases/download/qt_build/ QT_BUILD_x86: qt-5_7_1-x86-msvc2017-static QT_BUILD_x64: qt-5_7_1-x64-msvc2017-static + # Builds + PJ64PluginsDirQT: $(BUILD_PATH)\QT_for_Project64\ + PJ64PluginsDirQT_x64: $(BUILD_PATH)\QT_for_Project64_x64\ + PJ64PluginsDirWTL: $(BUILD_PATH)\WTL_for_Project64\ + PJ64PluginsDirWTL_x64: $(BUILD_PATH)\WTL_for_Project64_x64\ + Mupen64PluginsDir: $(BUILD_PATH)\for_Mupen64Plus\ + Mupen64PluginsDir_x64: $(BUILD_PATH)\for_Mupen64Plus_x64\ before_build: - curl -L -o %QT_BUILD_x86%.7z %QT_BUILD_BASE_URL%/%QT_BUILD_x86%.7z @@ -29,41 +31,51 @@ before_build: build_script: - cd %APPVEYOR_BUILD_FOLDER% + # Zilmar-spec (Qt) - set QTDIR=%QTDIR_x64%\%QT_BUILD_x64% - msbuild projects/msvc/GLideNUI.vcxproj /m /p:Configuration=Release;Platform=x64 - msbuild projects/msvc/GLideN64.sln /m /p:Configuration=Release_qt;Platform=x64 - set QTDIR=%QTDIR_x86%\%QT_BUILD_x86% - msbuild projects/msvc/GLideNUI.vcxproj /m /p:Configuration=Release;Platform=Win32 - msbuild projects/msvc/GLideN64.sln /m /p:Configuration=Release_qt;Platform=Win32 + # Zilmar-spec (WTL) - msbuild projects/msvc/GLideNUI-wtl.vcxproj /m /p:Configuration=Release;Platform=x64 - msbuild projects/msvc/GLideN64.sln /m /p:Configuration=Release_wtl;Platform=x64 - msbuild projects/msvc/GLideNUI-wtl.vcxproj /m /p:Configuration=Release;Platform=Win32 - msbuild projects/msvc/GLideN64.sln /m /p:Configuration=Release_wtl;Platform=Win32 + # Mupen64Plus (nogui) - msbuild projects/msvc/GLideN64.sln /m /p:Configuration=Release_mupenplus;Platform=x64 - msbuild projects/msvc/GLideN64.sln /m /p:Configuration=Release_mupenplus;Platform=Win32 after_build: - - copy ini\GLideN64.custom.ini %PJ64PluginsDirQT% + # Zilmar-spec (Qt) - copy ini\GLideN64.custom.ini %PJ64PluginsDirQT_x64% - - copy ini\GLideN64.custom.ini %PJ64PluginsDirWTL% - - copy ini\GLideN64.custom.ini %PJ64PluginsDirWTL_x64% - - copy translations\release\*.qm %PJ64PluginsDirQT% + - copy ini\GLideN64.custom.ini %PJ64PluginsDirQT% - copy translations\release\*.qm %PJ64PluginsDirQT_x64% - - copy translations\release\*.qm %PJ64PluginsDirWTL% - - copy translations\release\*.qm %PJ64PluginsDirWTL_x64% + - copy translations\release\*.qm %PJ64PluginsDirQT% + # Zilmar-spec (WTL) + - copy ini\GLideN64.custom.ini %PJ64PluginsDirWTL_x64% + - copy ini\GLideN64.custom.ini %PJ64PluginsDirWTL% + - mkdir %PJ64PluginsDirWTL_x64%\translations + - mkdir %PJ64PluginsDirWTL%\translations + - copy translations\wtl\*.Lang %PJ64PluginsDirWTL_x64%\translations + - copy translations\wtl\*.Lang %PJ64PluginsDirWTL%\translations + # Mupen64Plus (nogui) - copy ini\GLideN64.custom.ini %Mupen64PluginsDir_x64%\ - copy ini\GLideN64.custom.ini %Mupen64PluginsDir%\ - - del /Q %PJ64PluginsDir%\*.lib %PJ64PluginsDirQT%\*.exp - - del /Q %PJ64PluginsDir_x64%\*.lib %PJ64PluginsDirQT_x64%\*.exp - - del /Q %PJ64PluginsDir%\*.lib %PJ64PluginsDirWTL%\*.exp - - del /Q %PJ64PluginsDir_x64%\*.lib %PJ64PluginsDirWTL_x64%\*.exp + # Cleanup + - del /Q %PJ64PluginsDirQT_x64%\*.lib %PJ64PluginsDirQT_x64%\*.exp + - del /Q %PJ64PluginsDirQT%\*.lib %PJ64PluginsDirQT%\*.exp + - del /Q %PJ64PluginsDirWTL_x64%\*.lib %PJ64PluginsDirWTL_x64%\*.exp + - del /Q %PJ64PluginsDirWTL%\*.lib %PJ64PluginsDirWTL%\*.exp - del /Q %Mupen64PluginsDir_x64%\*.lib %Mupen64PluginsDir_x64%\*.exp - del /Q %Mupen64PluginsDir%\*.lib %Mupen64PluginsDir%\*.exp - - cd C:\projects\gliden64\build + - cd %BUILD_PATH% - ps: $env:revision = git describe --always - - set archive_name=GLideN64-%revision%.7z - - 7z a %archive_name% * + - set archive_name=GLideN64-%revision%-@fname.7z + - forfiles /p %BUILD_PATH% /c "cmd /c 7z a %archive_name% @path\*" artifacts: - - path: build\$(archive_name) - name: GLideN64 + - path: build\*.7z + name: GLideN64 plugin + type: 7z archive diff --git a/projects/msvc/GLideN64.sln b/projects/msvc/GLideN64.sln index e2fc71f2..114bff27 100644 --- a/projects/msvc/GLideN64.sln +++ b/projects/msvc/GLideN64.sln @@ -123,20 +123,16 @@ Global {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release_wtl|x64.ActiveCfg = Release|x64 {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Debug_mupenplus|Win32.ActiveCfg = Debug|Win32 {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Debug_mupenplus|x64.ActiveCfg = Debug|x64 - {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Debug_mupenplus|x64.Build.0 = Debug|x64 {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Debug_qt|Win32.ActiveCfg = Debug|Win32 {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Debug_qt|x64.ActiveCfg = Debug|x64 - {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Debug_qt|x64.Build.0 = Debug|x64 {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Debug_wtl|Win32.ActiveCfg = Debug|Win32 {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Debug_wtl|Win32.Build.0 = Debug|Win32 {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Debug_wtl|x64.ActiveCfg = Debug|x64 {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Debug_wtl|x64.Build.0 = Debug|x64 {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Release_mupenplus|Win32.ActiveCfg = Release|Win32 {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Release_mupenplus|x64.ActiveCfg = Release|x64 - {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Release_mupenplus|x64.Build.0 = Release|x64 {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Release_qt|Win32.ActiveCfg = Release|Win32 {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Release_qt|x64.ActiveCfg = Release|x64 - {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Release_qt|x64.Build.0 = Release|x64 {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Release_wtl|Win32.ActiveCfg = Release|Win32 {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Release_wtl|Win32.Build.0 = Release|Win32 {9E05B70F-A294-44A9-A151-B2CC95AA884E}.Release_wtl|x64.ActiveCfg = Release|x64 @@ -146,7 +142,7 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {D7155823-2893-4425-94B4-BA469E774A27} Qt5Version = $(DefaultQtVersion) + SolutionGuid = {D7155823-2893-4425-94B4-BA469E774A27} EndGlobalSection EndGlobal diff --git a/projects/msvc/GLideNUI-wtl.vcxproj b/projects/msvc/GLideNUI-wtl.vcxproj index 0bb224a6..fd2e9d17 100644 --- a/projects/msvc/GLideNUI-wtl.vcxproj +++ b/projects/msvc/GLideNUI-wtl.vcxproj @@ -164,31 +164,21 @@ - - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + diff --git a/projects/msvc/GLideNUI-wtl.vcxproj.filters b/projects/msvc/GLideNUI-wtl.vcxproj.filters index 30d10192..a286bf8a 100644 --- a/projects/msvc/GLideNUI-wtl.vcxproj.filters +++ b/projects/msvc/GLideNUI-wtl.vcxproj.filters @@ -247,73 +247,43 @@ - - Resource Files - - - Resource Files - - - Resource Files - Resource Files - + Resource Files - + Resource Files - + Resource Files - + Resource Files - + Resource Files - + Resource Files - + Resource Files - + Resource Files - + Resource Files - + Resource Files - + Resource Files - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - + Resource Files diff --git a/projects/msvc/GLideNUI.vcxproj b/projects/msvc/GLideNUI.vcxproj index 689b28aa..3b8d2cfd 100644 --- a/projects/msvc/GLideNUI.vcxproj +++ b/projects/msvc/GLideNUI.vcxproj @@ -168,7 +168,7 @@ endlocal - + true diff --git a/projects/msvc/GLideNUI.vcxproj.filters b/projects/msvc/GLideNUI.vcxproj.filters index 29383d81..67b6c557 100644 --- a/projects/msvc/GLideNUI.vcxproj.filters +++ b/projects/msvc/GLideNUI.vcxproj.filters @@ -117,7 +117,7 @@ - + Resource Files diff --git a/src/GLideNUI-wtl/GLideNUI.rc b/src/GLideNUI-wtl/GLideNUI.rc index 475af678..b96fd602 100644 Binary files a/src/GLideNUI-wtl/GLideNUI.rc and b/src/GLideNUI-wtl/GLideNUI.rc differ diff --git a/src/GLideNUI-wtl/icon.qrc b/src/GLideNUI-wtl/icon.qrc deleted file mode 100644 index 0f602f33..00000000 --- a/src/GLideNUI-wtl/icon.qrc +++ /dev/null @@ -1,15 +0,0 @@ - - - Icon.ico - Warning.ico - Info.ico - Up.ico - Right.ico - Down.ico - Left.ico - TopLeft.ico - TopRight.ico - BottomRight.ico - BottomLeft.ico - - diff --git a/src/GLideNUI/BottomLeft.ico b/src/GLideNUI/BottomLeft.ico deleted file mode 100644 index a6bc4858..00000000 Binary files a/src/GLideNUI/BottomLeft.ico and /dev/null differ diff --git a/src/GLideNUI/BottomRight.ico b/src/GLideNUI/BottomRight.ico deleted file mode 100644 index 8d38d85f..00000000 Binary files a/src/GLideNUI/BottomRight.ico and /dev/null differ diff --git a/src/GLideNUI/Down.ico b/src/GLideNUI/Down.ico deleted file mode 100644 index bbedfabd..00000000 Binary files a/src/GLideNUI/Down.ico and /dev/null differ diff --git a/src/GLideNUI/Icon-Original.ico b/src/GLideNUI/Icon-Original.ico deleted file mode 100644 index b8367ae3..00000000 Binary files a/src/GLideNUI/Icon-Original.ico and /dev/null differ diff --git a/src/GLideNUI/Icon.ico b/src/GLideNUI/Icon.ico deleted file mode 100644 index 4d012b19..00000000 Binary files a/src/GLideNUI/Icon.ico and /dev/null differ diff --git a/src/GLideNUI/Info.ico b/src/GLideNUI/Info.ico deleted file mode 100644 index 63684d27..00000000 Binary files a/src/GLideNUI/Info.ico and /dev/null differ diff --git a/src/GLideNUI/Left.ico b/src/GLideNUI/Left.ico deleted file mode 100644 index 7c248a53..00000000 Binary files a/src/GLideNUI/Left.ico and /dev/null differ diff --git a/src/GLideNUI-wtl/BottomLeft.ico b/src/GLideNUI/Resources/BottomLeft.ico similarity index 100% rename from src/GLideNUI-wtl/BottomLeft.ico rename to src/GLideNUI/Resources/BottomLeft.ico diff --git a/src/GLideNUI-wtl/BottomRight.ico b/src/GLideNUI/Resources/BottomRight.ico similarity index 100% rename from src/GLideNUI-wtl/BottomRight.ico rename to src/GLideNUI/Resources/BottomRight.ico diff --git a/src/GLideNUI-wtl/Down.ico b/src/GLideNUI/Resources/Down.ico similarity index 100% rename from src/GLideNUI-wtl/Down.ico rename to src/GLideNUI/Resources/Down.ico diff --git a/src/GLideNUI-wtl/Icon-Original.ico b/src/GLideNUI/Resources/Icon-Original.ico similarity index 100% rename from src/GLideNUI-wtl/Icon-Original.ico rename to src/GLideNUI/Resources/Icon-Original.ico diff --git a/src/GLideNUI-wtl/Icon.ico b/src/GLideNUI/Resources/Icon.ico similarity index 100% rename from src/GLideNUI-wtl/Icon.ico rename to src/GLideNUI/Resources/Icon.ico diff --git a/src/GLideNUI-wtl/Info.ico b/src/GLideNUI/Resources/Info.ico similarity index 100% rename from src/GLideNUI-wtl/Info.ico rename to src/GLideNUI/Resources/Info.ico diff --git a/src/GLideNUI-wtl/Left.ico b/src/GLideNUI/Resources/Left.ico similarity index 100% rename from src/GLideNUI-wtl/Left.ico rename to src/GLideNUI/Resources/Left.ico diff --git a/src/GLideNUI-wtl/Right.ico b/src/GLideNUI/Resources/Right.ico similarity index 100% rename from src/GLideNUI-wtl/Right.ico rename to src/GLideNUI/Resources/Right.ico diff --git a/src/GLideNUI-wtl/TopLeft.ico b/src/GLideNUI/Resources/TopLeft.ico similarity index 100% rename from src/GLideNUI-wtl/TopLeft.ico rename to src/GLideNUI/Resources/TopLeft.ico diff --git a/src/GLideNUI-wtl/TopRight.ico b/src/GLideNUI/Resources/TopRight.ico similarity index 100% rename from src/GLideNUI-wtl/TopRight.ico rename to src/GLideNUI/Resources/TopRight.ico diff --git a/src/GLideNUI-wtl/Up.ico b/src/GLideNUI/Resources/Up.ico similarity index 100% rename from src/GLideNUI-wtl/Up.ico rename to src/GLideNUI/Resources/Up.ico diff --git a/src/GLideNUI-wtl/Warning.ico b/src/GLideNUI/Resources/Warning.ico similarity index 100% rename from src/GLideNUI-wtl/Warning.ico rename to src/GLideNUI/Resources/Warning.ico diff --git a/src/GLideNUI/Right.ico b/src/GLideNUI/Right.ico deleted file mode 100644 index e9775892..00000000 Binary files a/src/GLideNUI/Right.ico and /dev/null differ diff --git a/src/GLideNUI/TopLeft.ico b/src/GLideNUI/TopLeft.ico deleted file mode 100644 index a11fc6ed..00000000 Binary files a/src/GLideNUI/TopLeft.ico and /dev/null differ diff --git a/src/GLideNUI/TopRight.ico b/src/GLideNUI/TopRight.ico deleted file mode 100644 index 7f330f97..00000000 Binary files a/src/GLideNUI/TopRight.ico and /dev/null differ diff --git a/src/GLideNUI/Up.ico b/src/GLideNUI/Up.ico deleted file mode 100644 index 3a449254..00000000 Binary files a/src/GLideNUI/Up.ico and /dev/null differ diff --git a/src/GLideNUI/Warning.ico b/src/GLideNUI/Warning.ico deleted file mode 100644 index e75cf402..00000000 Binary files a/src/GLideNUI/Warning.ico and /dev/null differ diff --git a/src/GLideNUI/icon.qrc b/src/GLideNUI/icon.qrc index 0f602f33..9929470a 100644 --- a/src/GLideNUI/icon.qrc +++ b/src/GLideNUI/icon.qrc @@ -1,15 +1,15 @@ - Icon.ico - Warning.ico - Info.ico - Up.ico - Right.ico - Down.ico - Left.ico - TopLeft.ico - TopRight.ico - BottomRight.ico - BottomLeft.ico + Resources/BottomLeft.ico + Resources/BottomRight.ico + Resources/Down.ico + Resources/Icon.ico + Resources/Info.ico + Resources/Left.ico + Resources/Right.ico + Resources/TopLeft.ico + Resources/TopRight.ico + Resources/Up.ico + Resources/Warning.ico