Update project files
-Added N64PluginsDir-wtl and N64PluginsDir-wtl_x64 environment variables for zilmar-spec-wtl
-Updated appveyor.yml to support wtl configurations
-Split artifacts into individual 7z files for each configuration instead of a single archive holding them all together
-Move icons to Resources folder to avoid duplicate assets
-Updated icon.qrc
-Updated GLideNUI.rc
-Update GLideN64.sln
-Fix very serious overlook in x64 builds
This should fix AppVeyor issues
Use variable names from 3fe5f50
54
appveyor.yml
|
@ -9,17 +9,19 @@ branches:
|
||||||
skip_branch_with_pr: true
|
skip_branch_with_pr: true
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
PJ64PluginsDirQT: C:\projects\gliden64\build\GLideN64-QT_for_Project64\
|
BUILD_PATH: $(APPVEYOR_BUILD_FOLDER)\build
|
||||||
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_x86: C:\Static_Qt_x86
|
||||||
QTDIR_x64: C:\Static_Qt_x64
|
QTDIR_x64: C:\Static_Qt_x64
|
||||||
QT_BUILD_BASE_URL: https://github.com/gonetz/GLideN64/releases/download/qt_build/
|
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_x86: qt-5_7_1-x86-msvc2017-static
|
||||||
QT_BUILD_x64: qt-5_7_1-x64-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:
|
before_build:
|
||||||
- curl -L -o %QT_BUILD_x86%.7z %QT_BUILD_BASE_URL%/%QT_BUILD_x86%.7z
|
- curl -L -o %QT_BUILD_x86%.7z %QT_BUILD_BASE_URL%/%QT_BUILD_x86%.7z
|
||||||
|
@ -29,41 +31,51 @@ before_build:
|
||||||
|
|
||||||
build_script:
|
build_script:
|
||||||
- cd %APPVEYOR_BUILD_FOLDER%
|
- cd %APPVEYOR_BUILD_FOLDER%
|
||||||
|
# Zilmar-spec (Qt)
|
||||||
- set QTDIR=%QTDIR_x64%\%QT_BUILD_x64%
|
- set QTDIR=%QTDIR_x64%\%QT_BUILD_x64%
|
||||||
- msbuild projects/msvc/GLideNUI.vcxproj /m /p:Configuration=Release;Platform=x64
|
- msbuild projects/msvc/GLideNUI.vcxproj /m /p:Configuration=Release;Platform=x64
|
||||||
- msbuild projects/msvc/GLideN64.sln /m /p:Configuration=Release_qt;Platform=x64
|
- msbuild projects/msvc/GLideN64.sln /m /p:Configuration=Release_qt;Platform=x64
|
||||||
- set QTDIR=%QTDIR_x86%\%QT_BUILD_x86%
|
- set QTDIR=%QTDIR_x86%\%QT_BUILD_x86%
|
||||||
- msbuild projects/msvc/GLideNUI.vcxproj /m /p:Configuration=Release;Platform=Win32
|
- msbuild projects/msvc/GLideNUI.vcxproj /m /p:Configuration=Release;Platform=Win32
|
||||||
- msbuild projects/msvc/GLideN64.sln /m /p:Configuration=Release_qt;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/GLideNUI-wtl.vcxproj /m /p:Configuration=Release;Platform=x64
|
||||||
- msbuild projects/msvc/GLideN64.sln /m /p:Configuration=Release_wtl;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/GLideNUI-wtl.vcxproj /m /p:Configuration=Release;Platform=Win32
|
||||||
- msbuild projects/msvc/GLideN64.sln /m /p:Configuration=Release_wtl;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=x64
|
||||||
- msbuild projects/msvc/GLideN64.sln /m /p:Configuration=Release_mupenplus;Platform=Win32
|
- msbuild projects/msvc/GLideN64.sln /m /p:Configuration=Release_mupenplus;Platform=Win32
|
||||||
|
|
||||||
after_build:
|
after_build:
|
||||||
- copy ini\GLideN64.custom.ini %PJ64PluginsDirQT%
|
# Zilmar-spec (Qt)
|
||||||
- copy ini\GLideN64.custom.ini %PJ64PluginsDirQT_x64%
|
- copy ini\GLideN64.custom.ini %PJ64PluginsDirQT_x64%
|
||||||
- copy ini\GLideN64.custom.ini %PJ64PluginsDirWTL%
|
- copy ini\GLideN64.custom.ini %PJ64PluginsDirQT%
|
||||||
- copy ini\GLideN64.custom.ini %PJ64PluginsDirWTL_x64%
|
|
||||||
- copy translations\release\*.qm %PJ64PluginsDirQT%
|
|
||||||
- copy translations\release\*.qm %PJ64PluginsDirQT_x64%
|
- copy translations\release\*.qm %PJ64PluginsDirQT_x64%
|
||||||
- copy translations\release\*.qm %PJ64PluginsDirWTL%
|
- copy translations\release\*.qm %PJ64PluginsDirQT%
|
||||||
- copy translations\release\*.qm %PJ64PluginsDirWTL_x64%
|
# 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_x64%\
|
||||||
- copy ini\GLideN64.custom.ini %Mupen64PluginsDir%\
|
- copy ini\GLideN64.custom.ini %Mupen64PluginsDir%\
|
||||||
- del /Q %PJ64PluginsDir%\*.lib %PJ64PluginsDirQT%\*.exp
|
# Cleanup
|
||||||
- del /Q %PJ64PluginsDir_x64%\*.lib %PJ64PluginsDirQT_x64%\*.exp
|
- del /Q %PJ64PluginsDirQT_x64%\*.lib %PJ64PluginsDirQT_x64%\*.exp
|
||||||
- del /Q %PJ64PluginsDir%\*.lib %PJ64PluginsDirWTL%\*.exp
|
- del /Q %PJ64PluginsDirQT%\*.lib %PJ64PluginsDirQT%\*.exp
|
||||||
- del /Q %PJ64PluginsDir_x64%\*.lib %PJ64PluginsDirWTL_x64%\*.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_x64%\*.lib %Mupen64PluginsDir_x64%\*.exp
|
||||||
- del /Q %Mupen64PluginsDir%\*.lib %Mupen64PluginsDir%\*.exp
|
- del /Q %Mupen64PluginsDir%\*.lib %Mupen64PluginsDir%\*.exp
|
||||||
- cd C:\projects\gliden64\build
|
- cd %BUILD_PATH%
|
||||||
- ps: $env:revision = git describe --always
|
- ps: $env:revision = git describe --always
|
||||||
- set archive_name=GLideN64-%revision%.7z
|
- set archive_name=GLideN64-%revision%-@fname.7z
|
||||||
- 7z a %archive_name% *
|
- forfiles /p %BUILD_PATH% /c "cmd /c 7z a %archive_name% @path\*"
|
||||||
|
|
||||||
artifacts:
|
artifacts:
|
||||||
- path: build\$(archive_name)
|
- path: build\*.7z
|
||||||
name: GLideN64
|
name: GLideN64 plugin
|
||||||
|
type: 7z archive
|
||||||
|
|
|
@ -123,20 +123,16 @@ Global
|
||||||
{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release_wtl|x64.ActiveCfg = Release|x64
|
{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|Win32.ActiveCfg = Debug|Win32
|
||||||
{9E05B70F-A294-44A9-A151-B2CC95AA884E}.Debug_mupenplus|x64.ActiveCfg = Debug|x64
|
{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|Win32.ActiveCfg = Debug|Win32
|
||||||
{9E05B70F-A294-44A9-A151-B2CC95AA884E}.Debug_qt|x64.ActiveCfg = Debug|x64
|
{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.ActiveCfg = Debug|Win32
|
||||||
{9E05B70F-A294-44A9-A151-B2CC95AA884E}.Debug_wtl|Win32.Build.0 = 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.ActiveCfg = Debug|x64
|
||||||
{9E05B70F-A294-44A9-A151-B2CC95AA884E}.Debug_wtl|x64.Build.0 = 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|Win32.ActiveCfg = Release|Win32
|
||||||
{9E05B70F-A294-44A9-A151-B2CC95AA884E}.Release_mupenplus|x64.ActiveCfg = Release|x64
|
{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|Win32.ActiveCfg = Release|Win32
|
||||||
{9E05B70F-A294-44A9-A151-B2CC95AA884E}.Release_qt|x64.ActiveCfg = Release|x64
|
{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.ActiveCfg = Release|Win32
|
||||||
{9E05B70F-A294-44A9-A151-B2CC95AA884E}.Release_wtl|Win32.Build.0 = 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
|
{9E05B70F-A294-44A9-A151-B2CC95AA884E}.Release_wtl|x64.ActiveCfg = Release|x64
|
||||||
|
@ -146,7 +142,7 @@ Global
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
SolutionGuid = {D7155823-2893-4425-94B4-BA469E774A27}
|
|
||||||
Qt5Version = $(DefaultQtVersion)
|
Qt5Version = $(DefaultQtVersion)
|
||||||
|
SolutionGuid = {D7155823-2893-4425-94B4-BA469E774A27}
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
EndGlobal
|
EndGlobal
|
||||||
|
|
|
@ -164,31 +164,21 @@
|
||||||
<ClInclude Include="..\..\src\GLideNUI-wtl\WTL\atlwinx.h" />
|
<ClInclude Include="..\..\src\GLideNUI-wtl\WTL\atlwinx.h" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Image Include="..\..\src\GLideNUI-wtl\BottomLeft.ico" />
|
<ResourceCompile Include="..\..\src\GLideNUI-wtl\GLideNUI.rc" />
|
||||||
<Image Include="..\..\src\GLideNUI-wtl\BottomRight.ico" />
|
|
||||||
<Image Include="..\..\src\GLideNUI-wtl\Down.ico" />
|
|
||||||
<Image Include="..\..\src\GLideNUI-wtl\Icon-Original.ico" />
|
|
||||||
<Image Include="..\..\src\GLideNUI-wtl\Icon.ico" />
|
|
||||||
<Image Include="..\..\src\GLideNUI-wtl\Info.ico" />
|
|
||||||
<Image Include="..\..\src\GLideNUI-wtl\Left.ico" />
|
|
||||||
<Image Include="..\..\src\GLideNUI-wtl\Right.ico" />
|
|
||||||
<Image Include="..\..\src\GLideNUI-wtl\TopLeft.ico" />
|
|
||||||
<Image Include="..\..\src\GLideNUI-wtl\TopRight.ico" />
|
|
||||||
<Image Include="..\..\src\GLideNUI-wtl\Up.ico" />
|
|
||||||
<Image Include="..\..\src\GLideNUI\BottomLeft.ico" />
|
|
||||||
<Image Include="..\..\src\GLideNUI\BottomRight.ico" />
|
|
||||||
<Image Include="..\..\src\GLideNUI\Down.ico" />
|
|
||||||
<Image Include="..\..\src\GLideNUI\Icon-Original.ico" />
|
|
||||||
<Image Include="..\..\src\GLideNUI\Info.ico" />
|
|
||||||
<Image Include="..\..\src\GLideNUI\Left.ico" />
|
|
||||||
<Image Include="..\..\src\GLideNUI\Right.ico" />
|
|
||||||
<Image Include="..\..\src\GLideNUI\TopLeft.ico" />
|
|
||||||
<Image Include="..\..\src\GLideNUI\TopRight.ico" />
|
|
||||||
<Image Include="..\..\src\GLideNUI\Up.ico" />
|
|
||||||
<Image Include="..\..\src\GLideNUI\Warning.ico" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ResourceCompile Include="..\..\src\GLideNUI-wtl\GLideNUI.rc" />
|
<Image Include="..\..\src\GLideNUI\Resources\BottomLeft.ico" />
|
||||||
|
<Image Include="..\..\src\GLideNUI\Resources\BottomRight.ico" />
|
||||||
|
<Image Include="..\..\src\GLideNUI\Resources\Down.ico" />
|
||||||
|
<Image Include="..\..\src\GLideNUI\Resources\Icon-Original.ico" />
|
||||||
|
<Image Include="..\..\src\GLideNUI\Resources\Icon.ico" />
|
||||||
|
<Image Include="..\..\src\GLideNUI\Resources\Info.ico" />
|
||||||
|
<Image Include="..\..\src\GLideNUI\Resources\Left.ico" />
|
||||||
|
<Image Include="..\..\src\GLideNUI\Resources\Right.ico" />
|
||||||
|
<Image Include="..\..\src\GLideNUI\Resources\TopLeft.ico" />
|
||||||
|
<Image Include="..\..\src\GLideNUI\Resources\TopRight.ico" />
|
||||||
|
<Image Include="..\..\src\GLideNUI\Resources\Up.ico" />
|
||||||
|
<Image Include="..\..\src\GLideNUI\Resources\Warning.ico" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
<ImportGroup Label="ExtensionTargets" />
|
<ImportGroup Label="ExtensionTargets" />
|
||||||
|
|
|
@ -247,73 +247,43 @@
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Image Include="..\..\src\GLideNUI-wtl\BottomLeft.ico">
|
|
||||||
<Filter>Resource Files</Filter>
|
|
||||||
</Image>
|
|
||||||
<Image Include="..\..\src\GLideNUI-wtl\BottomRight.ico">
|
|
||||||
<Filter>Resource Files</Filter>
|
|
||||||
</Image>
|
|
||||||
<Image Include="..\..\src\GLideNUI-wtl\Down.ico">
|
|
||||||
<Filter>Resource Files</Filter>
|
|
||||||
</Image>
|
|
||||||
<Image Include="..\..\src\GLideNUI-wtl\Icon-Original.ico">
|
<Image Include="..\..\src\GLideNUI-wtl\Icon-Original.ico">
|
||||||
<Filter>Resource Files</Filter>
|
<Filter>Resource Files</Filter>
|
||||||
</Image>
|
</Image>
|
||||||
<Image Include="..\..\src\GLideNUI-wtl\Icon-Original.ico">
|
<Image Include="..\..\src\GLideNUI\Resources\BottomLeft.ico">
|
||||||
<Filter>Resource Files</Filter>
|
<Filter>Resource Files</Filter>
|
||||||
</Image>
|
</Image>
|
||||||
<Image Include="..\..\src\GLideNUI-wtl\Info.ico">
|
<Image Include="..\..\src\GLideNUI\Resources\BottomRight.ico">
|
||||||
<Filter>Resource Files</Filter>
|
<Filter>Resource Files</Filter>
|
||||||
</Image>
|
</Image>
|
||||||
<Image Include="..\..\src\GLideNUI-wtl\Left.ico">
|
<Image Include="..\..\src\GLideNUI\Resources\Down.ico">
|
||||||
<Filter>Resource Files</Filter>
|
<Filter>Resource Files</Filter>
|
||||||
</Image>
|
</Image>
|
||||||
<Image Include="..\..\src\GLideNUI-wtl\Right.ico">
|
<Image Include="..\..\src\GLideNUI\Resources\Icon.ico">
|
||||||
<Filter>Resource Files</Filter>
|
<Filter>Resource Files</Filter>
|
||||||
</Image>
|
</Image>
|
||||||
<Image Include="..\..\src\GLideNUI-wtl\TopLeft.ico">
|
<Image Include="..\..\src\GLideNUI\Resources\Icon-Original.ico">
|
||||||
<Filter>Resource Files</Filter>
|
<Filter>Resource Files</Filter>
|
||||||
</Image>
|
</Image>
|
||||||
<Image Include="..\..\src\GLideNUI-wtl\TopRight.ico">
|
<Image Include="..\..\src\GLideNUI\Resources\Info.ico">
|
||||||
<Filter>Resource Files</Filter>
|
<Filter>Resource Files</Filter>
|
||||||
</Image>
|
</Image>
|
||||||
<Image Include="..\..\src\GLideNUI-wtl\Up.ico">
|
<Image Include="..\..\src\GLideNUI\Resources\Left.ico">
|
||||||
<Filter>Resource Files</Filter>
|
<Filter>Resource Files</Filter>
|
||||||
</Image>
|
</Image>
|
||||||
<Image Include="..\..\src\GLideNUI\Info.ico">
|
<Image Include="..\..\src\GLideNUI\Resources\Right.ico">
|
||||||
<Filter>Resource Files</Filter>
|
<Filter>Resource Files</Filter>
|
||||||
</Image>
|
</Image>
|
||||||
<Image Include="..\..\src\GLideNUI\Warning.ico">
|
<Image Include="..\..\src\GLideNUI\Resources\TopLeft.ico">
|
||||||
<Filter>Resource Files</Filter>
|
<Filter>Resource Files</Filter>
|
||||||
</Image>
|
</Image>
|
||||||
<Image Include="..\..\src\GLideNUI\TopLeft.ico">
|
<Image Include="..\..\src\GLideNUI\Resources\TopRight.ico">
|
||||||
<Filter>Resource Files</Filter>
|
<Filter>Resource Files</Filter>
|
||||||
</Image>
|
</Image>
|
||||||
<Image Include="..\..\src\GLideNUI\Up.ico">
|
<Image Include="..\..\src\GLideNUI\Resources\Up.ico">
|
||||||
<Filter>Resource Files</Filter>
|
<Filter>Resource Files</Filter>
|
||||||
</Image>
|
</Image>
|
||||||
<Image Include="..\..\src\GLideNUI\TopRight.ico">
|
<Image Include="..\..\src\GLideNUI\Resources\Warning.ico">
|
||||||
<Filter>Resource Files</Filter>
|
|
||||||
</Image>
|
|
||||||
<Image Include="..\..\src\GLideNUI\Left.ico">
|
|
||||||
<Filter>Resource Files</Filter>
|
|
||||||
</Image>
|
|
||||||
<Image Include="..\..\src\GLideNUI\Right.ico">
|
|
||||||
<Filter>Resource Files</Filter>
|
|
||||||
</Image>
|
|
||||||
<Image Include="..\..\src\GLideNUI\BottomLeft.ico">
|
|
||||||
<Filter>Resource Files</Filter>
|
|
||||||
</Image>
|
|
||||||
<Image Include="..\..\src\GLideNUI\Down.ico">
|
|
||||||
<Filter>Resource Files</Filter>
|
|
||||||
</Image>
|
|
||||||
<Image Include="..\..\src\GLideNUI\BottomRight.ico">
|
|
||||||
<Filter>Resource Files</Filter>
|
|
||||||
</Image>
|
|
||||||
<Image Include="..\..\src\GLideNUI-wtl\Icon.ico">
|
|
||||||
<Filter>Resource Files</Filter>
|
|
||||||
</Image>
|
|
||||||
<Image Include="..\..\src\GLideNUI\Icon-Original.ico">
|
|
||||||
<Filter>Resource Files</Filter>
|
<Filter>Resource Files</Filter>
|
||||||
</Image>
|
</Image>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
|
@ -168,7 +168,7 @@ endlocal
|
||||||
</CustomBuild>
|
</CustomBuild>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="..\..\src\GLideNUI\Icon.ico">
|
<None Include="..\..\src\GLideNUI\Resources\Icon.ico">
|
||||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||||
</None>
|
</None>
|
||||||
<CustomBuild Include="..\..\src\GLideNUI\icon.qrc">
|
<CustomBuild Include="..\..\src\GLideNUI\icon.qrc">
|
||||||
|
|
|
@ -117,7 +117,7 @@
|
||||||
</CustomBuild>
|
</CustomBuild>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="..\..\src\GLideNUI\Icon.ico">
|
<None Include="..\..\src\GLideNUI\Resources\Icon.ico">
|
||||||
<Filter>Resource Files</Filter>
|
<Filter>Resource Files</Filter>
|
||||||
</None>
|
</None>
|
||||||
<CustomBuild Include="..\..\src\GLideNUI\icon.qrc">
|
<CustomBuild Include="..\..\src\GLideNUI\icon.qrc">
|
||||||
|
|
|
@ -1,15 +0,0 @@
|
||||||
<RCC>
|
|
||||||
<qresource prefix="/">
|
|
||||||
<file>Icon.ico</file>
|
|
||||||
<file>Warning.ico</file>
|
|
||||||
<file>Info.ico</file>
|
|
||||||
<file>Up.ico</file>
|
|
||||||
<file>Right.ico</file>
|
|
||||||
<file>Down.ico</file>
|
|
||||||
<file>Left.ico</file>
|
|
||||||
<file>TopLeft.ico</file>
|
|
||||||
<file>TopRight.ico</file>
|
|
||||||
<file>BottomRight.ico</file>
|
|
||||||
<file>BottomLeft.ico</file>
|
|
||||||
</qresource>
|
|
||||||
</RCC>
|
|
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 47 KiB |
Before Width: | Height: | Size: 17 KiB |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 47 KiB After Width: | Height: | Size: 47 KiB |
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 4.2 KiB |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 4.2 KiB |
|
@ -1,15 +1,15 @@
|
||||||
<RCC>
|
<RCC>
|
||||||
<qresource prefix="/">
|
<qresource prefix="/">
|
||||||
<file>Icon.ico</file>
|
<file alias="BottomLeft.ico">Resources/BottomLeft.ico</file>
|
||||||
<file>Warning.ico</file>
|
<file alias="BottomRight.ico">Resources/BottomRight.ico</file>
|
||||||
<file>Info.ico</file>
|
<file alias="Down.ico">Resources/Down.ico</file>
|
||||||
<file>Up.ico</file>
|
<file alias="Icon.ico">Resources/Icon.ico</file>
|
||||||
<file>Right.ico</file>
|
<file alias="Info.ico">Resources/Info.ico</file>
|
||||||
<file>Down.ico</file>
|
<file alias="Left.ico">Resources/Left.ico</file>
|
||||||
<file>Left.ico</file>
|
<file alias="Right.ico">Resources/Right.ico</file>
|
||||||
<file>TopLeft.ico</file>
|
<file alias="TopLeft.ico">Resources/TopLeft.ico</file>
|
||||||
<file>TopRight.ico</file>
|
<file alias="TopRight.ico">Resources/TopRight.ico</file>
|
||||||
<file>BottomRight.ico</file>
|
<file alias="Up.ico">Resources/Up.ico</file>
|
||||||
<file>BottomLeft.ico</file>
|
<file alias="Warning.ico">Resources/Warning.ico</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
|
|