Commit f82a1039 authored by m4xw's avatar m4xw
Browse files

git subrepo clone --force ../GLideN64 GLideN64/

subrepo:
  subdir:   "GLideN64"
  merged:   "4d00fc549"
upstream:
  origin:   "../GLideN64"
  branch:   "develop"
  commit:   "4d00fc549"
git-subrepo:
  version:  "0.4.0"
  origin:   "???"
  commit:   "???"
parent b962af27
name: GLideN64
on: [push, pull_request, workflow_dispatch]
jobs:
Linux:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Install Packages
run: |
sudo apt-get -qq update
sudo apt-get -y upgrade
sudo apt-get -y install build-essential libgl1-mesa-dev qt5-default
- name: Prepare Environment
run: |
echo "GIT_REVISION=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
- name: Build GLideN64 (x64 Mupen64Plus-CLI)
run: |
mkdir -p build/linux-mupen64plus-cli
pushd build/linux-mupen64plus-cli
cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DMUPENPLUSAPI=1 -DMUPENPLUSAPI_GLIDENUI=0 ../../src/
make -j$(nproc)
popd
cp build/linux-mupen64plus-cli/plugin/Release/*.so build/linux-mupen64plus-cli/
cp ini/GLideN64.custom.ini build/linux-mupen64plus-cli/
- name: Build GLideN64 (x64 Mupen64Plus-Qt)
run: |
mkdir -p build/linux-mupen64plus-qt
pushd build/linux-mupen64plus-qt
cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DMUPENPLUSAPI=1 -DMUPENPLUSAPI_GLIDENUI=1 ../../src/
make -j$(nproc)
popd
cp build/linux-mupen64plus-qt/plugin/Release/*.so build/linux-mupen64plus-qt/
cp ini/GLideN64.custom.ini build/linux-mupen64plus-qt/
cp translations/release/*.qm build/linux-mupen64plus-qt/
- name: Upload GLideN64 (x64 Mupen64Plus-CLI)
uses: actions/upload-artifact@v2
with:
name: GLideN64-${{ env.GIT_REVISION }}-Linux-Mupen64Plus-CLI-x64
path: |
build/linux-mupen64plus-cli/*.so
build/linux-mupen64plus-cli/GLideN64.custom.ini
- name: Upload GLideN64 (x64 Mupen64Plus-Qt)
uses: actions/upload-artifact@v2
with:
name: GLideN64-${{ env.GIT_REVISION }}-Linux-Mupen64Plus-Qt-x64
path: |
build/linux-mupen64plus-qt/*.so
build/linux-mupen64plus-qt/GLideN64.custom.ini
build/linux-mupen64plus-qt/*.qm
Windows:
runs-on: windows-latest
env:
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_15-x86-msvc2017-static
QT_BUILD_x64: qt-5_15-x64-msvc2017-static
steps:
- uses: actions/checkout@v2
- uses: microsoft/setup-msbuild@v1.0.3
- uses: msys2/setup-msys2@v2
with:
update: true
install: >-
make
mingw-w64-x86_64-cmake
mingw-w64-x86_64-gcc
mingw-w64-x86_64-freetype
mingw-w64-x86_64-libpng
mingw-w64-x86_64-qt5
git
- name: Prepare Environment
run: |
$env:revision = git rev-parse --short HEAD
echo "PJ64PluginsDirQT=$pwd\build\windows-project64-qt\" >> $env:GITHUB_ENV
echo "PJ64PluginsDirQT_x64=$pwd\build\windows-project64-qt-x64\" >> $env:GITHUB_ENV
echo "PJ64PluginsDirWTL=$pwd\build\windows-project64-wtl\" >> $env:GITHUB_ENV
echo "PJ64PluginsDirWTL_x64=$pwd\build\windows-project64-wtl-x64\" >> $env:GITHUB_ENV
echo "Mupen64PluginsDir=$pwd\build\windows-mupen64plus-cli\" >> $env:GITHUB_ENV
echo "Mupen64PluginsDir_x64=$pwd\build\windows-mupen64plus-cli-x64\" >> $env:GITHUB_ENV
echo "GIT_REVISION=$env:revision" >> $env:GITHUB_ENV
shell: pwsh
- name: Prepare Qt Builds
run: |
curl -L -o %QT_BUILD_x86%.7z %QT_BUILD_BASE_URL%/%QT_BUILD_x86%.7z
curl -L -o %QT_BUILD_x64%.7z %QT_BUILD_BASE_URL%/%QT_BUILD_x64%.7z
7z x -o%QTDIR_x86% %QT_BUILD_x86%.7z
7z x -o%QTDIR_x64% %QT_BUILD_x64%.7z
shell: cmd
- name: Build GLideN64 (x64 Project64-Qt)
run: |
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
copy ini\GLideN64.custom.ini %PJ64PluginsDirQT_x64%
copy translations\release\*.qm %PJ64PluginsDirQT_x64%
shell: cmd
- name: Build GLideN64 (x86 Project64-Qt)
run: |
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
copy ini\GLideN64.custom.ini %PJ64PluginsDirQT%
copy translations\release\*.qm %PJ64PluginsDirQT%
shell: cmd
- name: Build GLideN64 (x64 Project64-WTL)
run: |
msbuild projects/msvc/GLideNUI-wtl.vcxproj /m /p:Configuration=Release;Platform=x64
msbuild projects/msvc/GLideN64.sln /m /p:Configuration=Release_wtl;Platform=x64
copy ini\GLideN64.custom.ini %PJ64PluginsDirWTL_x64%
mkdir %PJ64PluginsDirWTL_x64%\translations
copy translations\wtl\*.Lang %PJ64PluginsDirWTL_x64%\translations
shell: cmd
- name: Build GLideN64 (x86 Project64-WTL)
run: |
msbuild projects/msvc/GLideNUI-wtl.vcxproj /m /p:Configuration=Release;Platform=Win32
msbuild projects/msvc/GLideN64.sln /m /p:Configuration=Release_wtl;Platform=Win32
copy ini\GLideN64.custom.ini %PJ64PluginsDirWTL%
mkdir %PJ64PluginsDirWTL%\translations
copy translations\wtl\*.Lang %PJ64PluginsDirWTL%\translations
shell: cmd
- name: Build GLideN64 (x64 Mupen64Plus-CLI)
run: |
msbuild projects/msvc/GLideN64.sln /m /p:Configuration=Release_mupenplus;Platform=x64
copy ini\GLideN64.custom.ini %Mupen64PluginsDir_x64%\
shell: cmd
- name: Build GLideN64 (x86 Mupen64Plus-CLI)
run: |
msbuild projects/msvc/GLideN64.sln /m /p:Configuration=Release_mupenplus;Platform=Win32
copy ini\GLideN64.custom.ini %Mupen64PluginsDir%\
shell: cmd
- name: Build GLideN64 (x64 Mupen64Plus-Qt)
run: |
mkdir -p build/windows-mupen64plus-qt
pushd build/windows-mupen64plus-qt
cmake -DCMAKE_BUILD_TYPE=Release -DMUPENPLUSAPI=1 -DMUPENPLUSAPI_GLIDENUI=1 -G "MSYS Makefiles" ../../src
make -j$(nproc)
popd
cp ini/GLideN64.custom.ini build/windows-mupen64plus-qt/
cp translations/release/*.qm build/windows-mupen64plus-qt/
shell: msys2 {0}
- name: Upload GLideN64 (x64 Project64-Qt)
uses: actions/upload-artifact@v2
with:
name: GLideN64-${{ env.GIT_REVISION }}-Windows-Project64-Qt-x64
path: |
build\windows-project64-qt-x64\*.dll
build\windows-project64-qt-x64\GLideN64.custom.ini
build\windows-project64-qt-x64\*.qm
- name: Upload GLideN64 (x86 Project64-Qt)
uses: actions/upload-artifact@v2
with:
name: GLideN64-${{ env.GIT_REVISION }}-Windows-Project64-Qt-x86
path: |
build\windows-project64-qt\*.dll
build\windows-project64-qt\GLideN64.custom.ini
build\windows-project64-qt\*.qm
- name: Upload GLideN64 (x64 Project64-WTL)
uses: actions/upload-artifact@v2
with:
name: GLideN64-${{ env.GIT_REVISION }}-Windows-Project64-WTL-x64
path: |
build\windows-project64-wtl-x64\*.dll
build\windows-project64-wtl-x64\GLideN64.custom.ini
build\windows-project64-wtl-x64\translations\*.Lang
- name: Upload GLideN64 (x86 Project64-WTL)
uses: actions/upload-artifact@v2
with:
name: GLideN64-${{ env.GIT_REVISION }}-Windows-Project64-WTL-x86
path: |
build\windows-project64-wtl\*.dll
build\windows-project64-wtl\GLideN64.custom.ini
build\windows-project64-wtl\translations\*.Lang
- name: Upload GLideN64 (x64 Mupen64Plus-CLI)
uses: actions/upload-artifact@v2
with:
name: GLideN64-${{ env.GIT_REVISION }}-Windows-Mupen64Plus-CLI-x64
path: |
build\windows-mupen64plus-cli-x64\*.dll
build\windows-mupen64plus-cli-x64\GLideN64.custom.ini
- name: Upload GLideN64 (x86 Mupen64Plus-CLI)
uses: actions/upload-artifact@v2
with:
name: GLideN64-${{ env.GIT_REVISION }}-Windows-Mupen64Plus-CLI-x86
path: |
build\windows-mupen64plus-cli\*.dll
build\windows-mupen64plus-cli\GLideN64.custom.ini
- name: Upload GLideN64 (x64 Mupen64Plus-Qt)
uses: actions/upload-artifact@v2
with:
name: GLideN64-${{ env.GIT_REVISION }}-Windows-Mupen64Plus-Qt-x64
path: |
build\windows-mupen64plus-qt\*.dll
build\windows-mupen64plus-qt\GLideN64.custom.ini
build\windows-mupen64plus-qt\*.qm
Release:
runs-on: ubuntu-latest
needs: [Windows, Linux]
if: github.ref == 'refs/heads/master'
steps:
- uses: actions/checkout@v2
- name: Download Artifacts
uses: actions/download-artifact@v2
with:
path: artifacts
# sadly we can't download the artifacts without extracting it
# so re-zip them
- name: Re-Package Artifacts
run: |
cd artifacts
for artifact in *
do
echo "-> Creating ${artifact}.zip"
pushd "$artifact"
zip -r "../${artifact}.zip" *
popd
done
- name: Update Git Tag
run: |
git tag -f github-actions
git push -f origin github-actions
- name: Create Release
uses: ncipollo/release-action@v1
with:
prerelease: true
allowUpdates: true
removeArtifacts: true
replacesArtifacts: false
tag: github-actions
artifacts: "artifacts/*.zip"
......@@ -6,7 +6,7 @@
[subrepo]
remote = git@github.com:libretro/GLideN64.git
branch = develop
commit = 9082c39ab8e4422d60dd5a12df96c5a601e75eaa
parent = 26e306acb956e0278765babace27c7fae107ba9e
commit = 4d00fc549cb8c3f499e680293e8bcf5cd48ee2fc
parent = b962af273c7628aa949e2ad189addb6b0367cc2c
method = rebase
cmdver = 0.4.0
dist: xenial
addons:
apt:
packages:
- libgl1-mesa-dev
- qt5-default
language: cpp
os:
- linux
- osx
compiler:
- gcc
- clang
env:
- TARGET_CPU=amd64 BUILD_CONFIGURATION=Debug GLIDENUI=On
- TARGET_CPU=amd64 BUILD_CONFIGURATION=Release GLIDENUI=On
# - TARGET_CPU=x86 BUILD_CONFIGURATION=Debug
# - TARGET_CPU=x86 BUILD_CONFIGURATION=Release
jobs:
exclude:
- os: osx
compiler: gcc
- os: osx
env: TARGET_CPU=x86 BUILD_CONFIGURATION=Debug
- os: osx
env: TARGET_CPU=x86 BUILD_CONFIGURATION=Release
script:
- src/getRevision.sh
- cd projects/cmake
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then export GLIDENUI=Off; fi
- cmake -DCMAKE_BUILD_TYPE=$BUILD_CONFIGURATION -DTARGET_CPU=$TARGET_CPU -DVEC4_OPT=On -DMUPENPLUSAPI=On -DMUPENPLUSAPI_GLIDENUI=$GLIDENUI ../../src/
- cmake --build .
- cd ../../
......@@ -3,14 +3,14 @@ GLideN64
A new generation, open-source graphics plugin for N64 emulators.
Windows latest build status for master branch:
[![Build status](https://ci.appveyor.com/api/projects/status/vx18fie77cgq23i8/branch/master?svg=true)](https://ci.appveyor.com/project/gonetz/gliden64/branch/master)
Latest build status for master branch:
[![GLideN64](https://github.com/gonetz/GLideN64/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/gonetz/GLideN64/actions?query=branch%3Amaster)
Linux and MacOsX latest build status for master branch:
[![Build Status](https://travis-ci.org/gonetz/GLideN64.svg?branch=master)](https://travis-ci.org/gonetz/GLideN64)
To get Continuous Integration (CI) builds for mupen64plus and zilmar-spec emulators:
* if you have a Github account, log in and click the build status icon, then click on the latest CI run.
* if you don't have a Github account, download the latest build from [the `github-actions` release.](https://github.com/gonetz/GLideN64/releases/tag/github-actions)
To get Continuous Integration (CI) builds for mupen64plus and zilmar-spec emulators for Windows: click the build status icon, then select "Artifacts".
You will get a zip containing both builds. Choose the between the 32-bit and 64-bit version depending on your emulator version.
If you want to download an earlier build, go to "History" and select the build you want.
Choose the between the 32-bit and 64-bit version depending on your emulator version.
If you want to download an earlier build, log into Github and click the status icon.
CI builds have the latest features and fixes, and are generally stable, but may introduce bugs and have incomplete translations.
image: Visual Studio 2017
version: 1.0.{build}
pull_requests:
do_not_increment_build_number: true
environment:
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
- curl -L -o %QT_BUILD_x64%.7z %QT_BUILD_BASE_URL%/%QT_BUILD_x64%.7z
- 7z x -o%QTDIR_x86% %QT_BUILD_x86%.7z
- 7z x -o%QTDIR_x64% %QT_BUILD_x64%.7z
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:
# Zilmar-spec (Qt)
- copy ini\GLideN64.custom.ini %PJ64PluginsDirQT_x64%
- copy ini\GLideN64.custom.ini %PJ64PluginsDirQT%
- copy translations\release\*.qm %PJ64PluginsDirQT_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%\
# 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 %BUILD_PATH%
- ps: $env:revision = git rev-parse --short HEAD
- set archive_name=GLideN64-%revision%-@fname.7z
- forfiles /p %BUILD_PATH% /c "cmd /c 7z a %archive_name% @path\*"
artifacts:
- path: build\*.7z
name: GLideN64 plugin
......@@ -13,7 +13,6 @@ multisampling=0
maxAnisotropy=0
bilinearMode=1
maxBytes=524288000
screenShotFormat=0
[generalEmulation]
enableFog=1
......
......@@ -251,6 +251,30 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)")</Command>
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug_qt' Or '$(Configuration)'=='Debug_wtl' Or '$(Configuration)'=='Debug_mupenplus' Or '$(Configuration)'=='Release_qt' Or '$(Configuration)'=='Release_wtl' Or '$(Configuration)'=='Release_mupenplus'">
<ClCompile>
<AdditionalIncludeDirectories>../../src/inc/freetype/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ConformanceMode Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus|Win32'">true</ConformanceMode>
<LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus|Win32'">stdcpp17</LanguageStandard>
<ConformanceMode Condition="'$(Configuration)|$(Platform)'=='Debug_qt|Win32'">true</ConformanceMode>
<LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug_qt|Win32'">stdcpp17</LanguageStandard>
<ConformanceMode Condition="'$(Configuration)|$(Platform)'=='Debug_wtl|Win32'">true</ConformanceMode>
<LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug_wtl|Win32'">stdcpp17</LanguageStandard>
<ConformanceMode Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|Win32'">true</ConformanceMode>
<LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|Win32'">stdcpp17</LanguageStandard>
<ConformanceMode Condition="'$(Configuration)|$(Platform)'=='Release_qt|Win32'">true</ConformanceMode>
<LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Release_qt|Win32'">stdcpp17</LanguageStandard>
<ConformanceMode Condition="'$(Configuration)|$(Platform)'=='Release_wtl|Win32'">true</ConformanceMode>
<LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Release_wtl|Win32'">stdcpp17</LanguageStandard>
<ConformanceMode Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus|x64'">true</ConformanceMode>
<LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug_mupenplus|x64'">stdcpp17</LanguageStandard>
<ConformanceMode Condition="'$(Configuration)|$(Platform)'=='Debug_qt|x64'">true</ConformanceMode>
<LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug_qt|x64'">stdcpp17</LanguageStandard>
<ConformanceMode Condition="'$(Configuration)|$(Platform)'=='Debug_wtl|x64'">true</ConformanceMode>
<LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug_wtl|x64'">stdcpp17</LanguageStandard>
<ConformanceMode Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|x64'">true</ConformanceMode>
<LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Release_mupenplus|x64'">stdcpp17</LanguageStandard>
<ConformanceMode Condition="'$(Configuration)|$(Platform)'=='Release_qt|x64'">true</ConformanceMode>
<LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Release_qt|x64'">stdcpp17</LanguageStandard>
<ConformanceMode Condition="'$(Configuration)|$(Platform)'=='Release_wtl|x64'">true</ConformanceMode>
<LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Release_wtl|x64'">stdcpp17</LanguageStandard>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
......@@ -285,8 +309,14 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)")</Command>
<ClCompile Include="..\..\src\Graphics\OpenGLContext\GLFunctions.cpp" />
<ClCompile Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerInputs.cpp" />
<ClCompile Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramBuilder.cpp" />
<ClCompile Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramBuilderCommon.cpp" />
<ClCompile Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramBuilderAccurate.cpp" />
<ClCompile Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramBuilderFast.cpp" />
<ClCompile Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramImpl.cpp" />
<ClCompile Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramUniformFactory.cpp" />
<ClCompile Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramUniformFactoryCommon.cpp" />
<ClCompile Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramUniformFactoryAccurate.cpp" />
<ClCompile Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramUniformFactoryFast.cpp" />
<ClCompile Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_FXAA.cpp" />
<ClCompile Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_ShaderStorage.cpp" />
<ClCompile Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_SpecialShadersFactory.cpp" />
......@@ -398,6 +428,9 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)")</Command>
<ClCompile Include="..\..\src\windows\ZilmarAPIImpl_windows.cpp">
<ExcludedFromBuild Condition="'$(Configuration)'=='Debug_mupenplus' Or '$(Configuration)'=='Release_mupenplus'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\windows\ScreenShot.cpp">
<ExcludedFromBuild Condition="'$(Configuration)'=='Debug_mupenplus' Or '$(Configuration)'=='Release_mupenplus'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\ZilmarPluginAPI.cpp">
<ExcludedFromBuild Condition="'$(Configuration)'=='Debug_mupenplus' Or '$(Configuration)'=='Release_mupenplus'">true</ExcludedFromBuild>
</ClCompile>
......@@ -428,7 +461,7 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)")</Command>
<ClInclude Include="..\..\src\GBI.h" />
<ClInclude Include="..\..\src\gDP.h" />
<ClInclude Include="..\..\src\GLideN64.h" />
<ClInclude Include="..\..\src\GLideNHQ\Ext_TxFilter.h" />
<ClInclude Include="..\..\src\GLideNHQ\TxFilterExport.h" />
<ClInclude Include="..\..\src\Graphics\ColorBufferReader.h" />
<ClInclude Include="..\..\src\Graphics\CombinerProgram.h" />
<ClInclude Include="..\..\src\Graphics\Context.h" />
......@@ -438,8 +471,14 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)")</Command>
<ClInclude Include="..\..\src\Graphics\OpenGLContext\GLFunctions.h" />
<ClInclude Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerInputs.h" />
<ClInclude Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramBuilder.h" />
<ClInclude Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramBuilderCommon.h" />
<ClInclude Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramBuilderAccurate.h" />
<ClInclude Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramBuilderFast.h" />
<ClInclude Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramImpl.h" />
<ClInclude Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramUniformFactory.h" />
<ClInclude Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramUniformFactoryCommon.h" />
<ClInclude Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramUniformFactoryAccurate.h" />
<ClInclude Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramUniformFactoryFast.h" />
<ClInclude Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_FXAA.h" />
<ClInclude Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_ShaderPart.h" />
<ClInclude Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_ShaderStorage.h" />
......
......@@ -146,6 +146,9 @@
<ClCompile Include="..\..\src\windows\ZilmarAPIImpl_windows.cpp">
<Filter>Source Files\windows</Filter>
</ClCompile>
<ClCompile Include="..\..\src\windows\ScreenShot.cpp">
<Filter>Source Files\windows</Filter>
</ClCompile>
<ClCompile Include="..\..\src\GLideNUI\Config_GLidenUI.cpp">
<Filter>Source Files\windows</Filter>
</ClCompile>
......@@ -218,6 +221,9 @@
<ClCompile Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramBuilder.cpp">
<Filter>Source Files\Graphics\OpenGL\GLSL</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramBuilderCommon.cpp">
<Filter>Source Files\Graphics\OpenGL\GLSL</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramImpl.cpp">
<Filter>Source Files\Graphics\OpenGL\GLSL</Filter>
</ClCompile>
......@@ -233,6 +239,9 @@
<ClCompile Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramUniformFactory.cpp">
<Filter>Source Files\Graphics\OpenGL\GLSL</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramUniformFactoryCommon.cpp">
<Filter>Source Files\Graphics\OpenGL\GLSL</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerInputs.cpp">
<Filter>Source Files\Graphics\OpenGL\GLSL</Filter>
</ClCompile>
......@@ -422,6 +431,18 @@
<ClCompile Include="..\..\src\BufferCopy\BlueNoiseTexture.cpp">
<Filter>Source Files\BufferCopy</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramBuilderAccurate.cpp">
<Filter>Source Files\Graphics\OpenGL\GLSL</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramBuilderFast.cpp">
<Filter>Source Files\Graphics\OpenGL\GLSL</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramUniformFactoryAccurate.cpp">
<Filter>Source Files\Graphics\OpenGL\GLSL</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramUniformFactoryFast.cpp">
<Filter>Source Files\Graphics\OpenGL\GLSL</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\3DMath.h">
......@@ -490,9 +511,6 @@
<ClInclude Include="..\..\src\Log.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\GLideNHQ\Ext_TxFilter.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\PostProcessor.h">
<Filter>Header Files</Filter>
</ClInclude>
......@@ -784,6 +802,27 @@
<ClInclude Include="..\..\src\resource.h">
<Filter>Resource Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramBuilderCommon.h">
<Filter>Header Files\Graphics\OpenGL\GLSL</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramBuilderAccurate.h">
<Filter>Header Files\Graphics\OpenGL\GLSL</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramBuilderFast.h">
<Filter>Header Files\Graphics\OpenGL\GLSL</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramUniformFactoryCommon.h">
<Filter>Header Files\Graphics\OpenGL\GLSL</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramUniformFactoryAccurate.h">
<Filter>Header Files\Graphics\OpenGL\GLSL</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramUniformFactoryFast.h">
<Filter>Header Files\Graphics\OpenGL\GLSL</Filter>
</ClInclude>
<ClInclude Include="..\..\src\GLideNHQ\TxFilterExport.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\src\GLideN64.rc">
......
@echo off
setlocal enableextensions disabledelayedexpansion
cls
set DPROJ=GLideN64.sln
set FPROJ=GLideN64.sln
set DMN=REM
set ERR=if errorlevel 1 goto err
set MSG=%DPROJ% does not exist in the same directory
if not exist "%~dp0%DPROJ%" goto err
set ARCH=
set BOTH=0
:: This allows the script to work from outside the repository for ease of
:: use by third-party tools with extended functionality such as regression
:: tracking
set TPSM=GLideN64\projects\msvc\
set EXIT=exit
if exist "%~dp0%TPSM%%FPROJ%" goto slavemode
set TPSM=
set EXIT=exit /b
set MSG=%FPROJ% does not exist in the same directory
if not exist "%~dp0%TPSM%%FPROJ%" goto err
:slavemode
set REB=
set CONF=Release
set KAP=7z
set NO7=0
set EXT=7z
set DQTD=1
set REB=
set NOQT=0
set NOWTL=0
set NOM64=0
set ESIM=0
set EBQ=start "" explorer .
taskkill /im msbuild.exe /f 2>nul
taskkill /im vctip.exe /f 2>nul
taskkill /im mspdbsrv.exe /f 2>nul
for %%B in (EX86 EX64 D7Z DPJQT DMQT DPJWTL DMCL ESIM) do set "%%B=0"
set DMQT=1
for %%K in (msbuild vctip mspdbsrv) do taskkill /im %%K.exe /f 2>nul
if "%*"=="" goto help
for %%P in (%*) do (
if /i "%%P"=="--clean" goto clean
if /i "%%P"=="--x86" set ARCH=x86
if /i "%%P"=="--x64" set ARCH=x64& set BOTH=0
if /i "%%P"=="--all" set ARCH=x64& set BOTH=1
if /i "%%P"=="--x86" set EX86=1
if /i "%%P"=="--x64" set EX64=1
if /i "%%P"=="--all" set EX86=1& set EX64=1
if /i "%%P"=