diff --git a/appveyor.yml b/appveyor.yml index 7852179b..a31688e3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,10 +9,12 @@ branches: skip_branch_with_pr: true environment: - N64PluginsDir: C:\projects\gliden64\build\Zilmar-spec\ - N64PluginsDir_x64: C:\projects\gliden64\build\Zilmar-spec_x64\ - Mupen64PluginsDir: C:\projects\gliden64\build\Mupen64Plus\ - Mupen64PluginsDir_x64: C:\projects\gliden64\build\Mupen64Plus_x64\ + 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\ 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/ @@ -41,14 +43,20 @@ build_script: - msbuild projects/msvc/GLideN64.sln /m /p:Configuration=Release_mupenplus;Platform=Win32 after_build: - - copy ini\GLideN64.custom.ini %N64PluginsDir_x64% - - copy translations\release\*.qm %N64PluginsDir_x64% - - copy ini\GLideN64.custom.ini %N64PluginsDir% - - copy translations\release\*.qm %N64PluginsDir% + - copy ini\GLideN64.custom.ini %PJ64PluginsDirQT% + - 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 translations\release\*.qm %PJ64PluginsDirQT_x64% + - copy translations\release\*.qm %PJ64PluginsDirWTL% + - copy translations\release\*.qm %PJ64PluginsDirWTL_x64% - copy ini\GLideN64.custom.ini %Mupen64PluginsDir_x64%\ - copy ini\GLideN64.custom.ini %Mupen64PluginsDir%\ - - del /Q %N64PluginsDir_x64%\*.lib %N64PluginsDir_x64%\*.exp - - del /Q %N64PluginsDir%\*.lib %N64PluginsDir%\*.exp + - 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 - del /Q %Mupen64PluginsDir_x64%\*.lib %Mupen64PluginsDir_x64%\*.exp - del /Q %Mupen64PluginsDir%\*.lib %Mupen64PluginsDir%\*.exp - cd C:\projects\gliden64\build diff --git a/projects/msvc/GLideN64.sln b/projects/msvc/GLideN64.sln index 2c2a9720..e2fc71f2 100644 --- a/projects/msvc/GLideN64.sln +++ b/projects/msvc/GLideN64.sln @@ -43,8 +43,8 @@ Global {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug_qt|x64.Build.0 = Debug_qt|x64 {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug_wtl|Win32.ActiveCfg = Debug_wtl|Win32 {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug_wtl|Win32.Build.0 = Debug_wtl|Win32 - {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug_wtl|x64.ActiveCfg = Debug_mupenplus|x64 - {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug_wtl|x64.Build.0 = Debug_mupenplus|x64 + {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug_wtl|x64.ActiveCfg = Debug_wtl|x64 + {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Debug_wtl|x64.Build.0 = Debug_wtl|x64 {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_mupenplus|Win32.ActiveCfg = Release_mupenplus|Win32 {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_mupenplus|Win32.Build.0 = Release_mupenplus|Win32 {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_mupenplus|x64.ActiveCfg = Release_mupenplus|x64 @@ -55,8 +55,8 @@ Global {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_qt|x64.Build.0 = Release_qt|x64 {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_wtl|Win32.ActiveCfg = Release_wtl|Win32 {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_wtl|Win32.Build.0 = Release_wtl|Win32 - {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_wtl|x64.ActiveCfg = Release_mupenplus|x64 - {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_wtl|x64.Build.0 = Release_mupenplus|x64 + {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_wtl|x64.ActiveCfg = Release_wtl|x64 + {37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_wtl|x64.Build.0 = Release_wtl|x64 {DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Debug_mupenplus|Win32.ActiveCfg = Debug|Win32 {DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Debug_mupenplus|Win32.Build.0 = Debug|Win32 {DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Debug_mupenplus|x64.ActiveCfg = Debug|x64 @@ -113,7 +113,6 @@ Global {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Debug_qt|x64.Build.0 = Debug|x64 {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Debug_wtl|Win32.ActiveCfg = Debug|Win32 {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Debug_wtl|x64.ActiveCfg = Debug|x64 - {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Debug_wtl|x64.Build.0 = Debug|x64 {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release_mupenplus|Win32.ActiveCfg = Release|Win32 {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release_mupenplus|x64.ActiveCfg = Release|x64 {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release_qt|Win32.ActiveCfg = Release|Win32 @@ -122,7 +121,6 @@ Global {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release_qt|x64.Build.0 = Release|x64 {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release_wtl|Win32.ActiveCfg = Release|Win32 {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release_wtl|x64.ActiveCfg = Release|x64 - {37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release_wtl|x64.Build.0 = 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 diff --git a/projects/msvc/GLideN64.vcxproj b/projects/msvc/GLideN64.vcxproj index 09e66dc9..9fe30363 100644 --- a/projects/msvc/GLideN64.vcxproj +++ b/projects/msvc/GLideN64.vcxproj @@ -195,12 +195,19 @@ ZILMAR_API;%(PreprocessorDefinitions) - + Copy result to plugins folder - if NOT "$(N64PluginsDir)" == "" (if not exist "$(N64PluginsDir)" mkdir "$(N64PluginsDir)" -copy /Y "$(OutDir)$(TargetName).*" "$(N64PluginsDir)") - if NOT "$(N64PluginsDir_x64)" == "" (if not exist "$(N64PluginsDir_x64)" mkdir "$(N64PluginsDir_x64)" -copy /Y "$(OutDir)$(TargetName).*" "$(N64PluginsDir_x64)") + if NOT "$(PJ64PluginsDirQT)" == "" (if not exist "$(PJ64PluginsDirQT)" mkdir "$(PJ64PluginsDirQT)" +copy /Y "$(OutDir)$(TargetName).*" "$(PJ64PluginsDirQT)") + if NOT "$(PJ64PluginsDirQT_x64)" == "" (if not exist "$(PJ64PluginsDirQT_x64)" mkdir "$(PJ64PluginsDirQT_x64)" +copy /Y "$(OutDir)$(TargetName).*" "$(PJ64PluginsDirQT_x64)") + + + Copy result to plugins folder + if NOT "$(PJ64PluginsDirWTL)" == "" (if not exist "$(PJ64PluginsDirWTL)" mkdir "$(PJ64PluginsDirWTL)" +copy /Y "$(OutDir)$(TargetName).*" "$(PJ64PluginsDirWTL)") + if NOT "$(PJ64PluginsDirWTL_x64)" == "" (if not exist "$(PJ64PluginsDirWTL_x64)" mkdir "$(PJ64PluginsDirWTL_x64)" +copy /Y "$(OutDir)$(TargetName).*" "$(PJ64PluginsDirWTL_x64)")