Skip to content

Commit

Permalink
Replace env var N64PluginsDir by PJ64PluginsDirQT and PJ64PluginsDirWTL
Browse files Browse the repository at this point in the history
Replace env var N64PluginsDir_64 by PJ64PluginsDirQT_64 and PJ64PluginsDirWTL_64
Update msvc project file.
Update appveyor script.
  • Loading branch information
gonetz committed Apr 25, 2020
1 parent 3114337 commit 28c4deb
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 17 deletions.
28 changes: 18 additions & 10 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down Expand Up @@ -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
Expand Down
22 changes: 15 additions & 7 deletions projects/msvc/GLideN64.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -189,18 +189,26 @@
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug_qt' Or '$(Configuration)'=='Debug_wtl' Or '$(Configuration)'=='Release_qt' Or '$(Configuration)'=='Release_wtl'">
<ClCompile>
<PreprocessorDefinitions>GL_USE_UNIFORMBLOCK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>ZILMAR_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug_qt' Or '$(Configuration)'=='Release_qt'">
<PostBuildEvent>
<Message>Copy result to plugins folder</Message>
<Command Condition="'$(Platform)'=='Win32'">if NOT "$(PJ64PluginsDirQT)" == "" (if not exist "$(PJ64PluginsDirQT)" mkdir "$(PJ64PluginsDirQT)"
copy /Y "$(OutDir)$(TargetName).*" "$(PJ64PluginsDirQT)")</Command>
<Command Condition="'$(Platform)'=='x64'">if NOT "$(PJ64PluginsDirQT_x64)" == "" (if not exist "$(PJ64PluginsDirQT_x64)" mkdir "$(PJ64PluginsDirQT_x64)"
copy /Y "$(OutDir)$(TargetName).*" "$(PJ64PluginsDirQT_x64)")</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug_wtl' Or '$(Configuration)'=='Release_wtl'">
<PostBuildEvent>
<Message>Copy result to plugins folder</Message>
<Command Condition="'$(Platform)'=='Win32'">if NOT "$(N64PluginsDir)" == "" (if not exist "$(N64PluginsDir)" mkdir "$(N64PluginsDir)"
copy /Y "$(OutDir)$(TargetName).*" "$(N64PluginsDir)")</Command>
<Command Condition="'$(Platform)'=='x64'">if NOT "$(N64PluginsDir_x64)" == "" (if not exist "$(N64PluginsDir_x64)" mkdir "$(N64PluginsDir_x64)"
copy /Y "$(OutDir)$(TargetName).*" "$(N64PluginsDir_x64)")</Command>
<Command Condition="'$(Platform)'=='Win32'">if NOT "$(PJ64PluginsDirWTL)" == "" (if not exist "$(PJ64PluginsDirWTL)" mkdir "$(PJ64PluginsDirWTL)"
copy /Y "$(OutDir)$(TargetName).*" "$(PJ64PluginsDirWTL)")</Command>
<Command Condition="'$(Platform)'=='x64'">if NOT "$(PJ64PluginsDirWTL_x64)" == "" (if not exist "$(PJ64PluginsDirWTL_x64)" mkdir "$(PJ64PluginsDirWTL_x64)"
copy /Y "$(OutDir)$(TargetName).*" "$(PJ64PluginsDirWTL_x64)")</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug_mupenplus' Or '$(Configuration)'=='Release_mupenplus'">
Expand Down

0 comments on commit 28c4deb

Please sign in to comment.