Skip to content

Commit 6ccadd1

Browse files
committed
Trying to fix GH actions
Finally might be fixed
1 parent a55f141 commit 6ccadd1

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

.github/workflows/main.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ jobs:
1313
with:
1414
vcpkgDirectory: '${{ github.workspace }}/vcpkg'
1515
vcpkgArguments: '@${{ github.workspace }}/vcpkg.txt'
16+
cleanAfterBuild: false
1617
- name: Setup MSBuild
1718
uses: microsoft/setup-msbuild@v1.0.0
18-
- name: Copy Dependencies
19-
run: 'cp ${{ github.workspace }}/vcpkg/packages/* ${{ github.workspace }}/dependencies/'
19+
- name: Check dependencies
20+
run: 'ls ${{ github.workspace }}/vcpkg/installed/x86-windows-static'
2021
- name: Build DLL
2122
run: 'msbuild SimpleGraphic.vcxproj /p:configuration=release /p:platform=win32'
2223
- name: Archive DLL

SimpleGraphic.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,14 @@
112112
<PrecompiledHeader>NotUsing</PrecompiledHeader>
113113
<PrecompiledHeaderFile>
114114
</PrecompiledHeaderFile>
115-
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)engine;$(SolutionDir)dependencies\giflib_x86-windows-static\include;$(SolutionDir)dependencies\libjpeg-turbo_x86-windows-static\include;$(SolutionDir)dependencies\liblzma_x86-windows-static\include;$(SolutionDir)dependencies\libpng_x86-windows-static\include;$(SolutionDir)dependencies\luajit_x86-windows-static\include;$(SolutionDir)dependencies\tiff_x86-windows-static\include;$(SolutionDir)dependencies\zlib_x86-windows-static\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
115+
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)engine;$(SolutionDir)vcpkg\installed\x86-windows-static\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
116116
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
117117
</ClCompile>
118118
<Link>
119119
<SubSystem>Windows</SubSystem>
120120
<GenerateDebugInformation>true</GenerateDebugInformation>
121121
<EnableUAC>false</EnableUAC>
122-
<AdditionalLibraryDirectories>$(SolutionDir)dependencies\giflib_x86-windows-static\lib;$(SolutionDir)dependencies\libjpeg-turbo_x86-windows-static\lib;$(SolutionDir)dependencies\liblzma_x86-windows-static\lib;$(SolutionDir)dependencies\libpng_x86-windows-static\lib;$(SolutionDir)dependencies\luajit_x86-windows-static\lib;$(SolutionDir)dependencies\tiff_x86-windows-static\lib;$(SolutionDir)dependencies\zlib_x86-windows-static\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
122+
<AdditionalLibraryDirectories>$(SolutionDir)vcpkg\installed\x86-windows-static\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
123123
<AdditionalDependencies>gif.lib;jpeg.lib;lzma.lib;libpng16.lib;lua51.lib;tiff.lib;zlib.lib;opengl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
124124
</Link>
125125
</ItemDefinitionGroup>
@@ -134,7 +134,7 @@
134134
<PrecompiledHeader>NotUsing</PrecompiledHeader>
135135
<PrecompiledHeaderFile>
136136
</PrecompiledHeaderFile>
137-
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)engine;$(SolutionDir)dependencies\giflib_x86-windows-static\include;$(SolutionDir)dependencies\libjpeg-turbo_x86-windows-static\include;$(SolutionDir)dependencies\liblzma_x86-windows-static\include;$(SolutionDir)dependencies\libpng_x86-windows-static\include;$(SolutionDir)dependencies\luajit_x86-windows-static\include;$(SolutionDir)dependencies\tiff_x86-windows-static\include;$(SolutionDir)dependencies\zlib_x86-windows-static\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
137+
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)engine;$(SolutionDir)vcpkg\installed\x86-windows-static\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
138138
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
139139
</ClCompile>
140140
<Link>
@@ -143,7 +143,7 @@
143143
<OptimizeReferences>true</OptimizeReferences>
144144
<GenerateDebugInformation>true</GenerateDebugInformation>
145145
<EnableUAC>false</EnableUAC>
146-
<AdditionalLibraryDirectories>$(SolutionDir)dependencies\giflib_x86-windows-static\lib;$(SolutionDir)dependencies\libjpeg-turbo_x86-windows-static\lib;$(SolutionDir)dependencies\liblzma_x86-windows-static\lib;$(SolutionDir)dependencies\libpng_x86-windows-static\lib;$(SolutionDir)dependencies\luajit_x86-windows-static\lib;$(SolutionDir)dependencies\tiff_x86-windows-static\lib;$(SolutionDir)dependencies\zlib_x86-windows-static\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
146+
<AdditionalLibraryDirectories>$(SolutionDir)vcpkg\installed\x86-windows-static\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
147147
<AdditionalDependencies>gif.lib;jpeg.lib;lzma.lib;libpng16.lib;lua51.lib;tiff.lib;zlib.lib;opengl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
148148
</Link>
149149
</ItemDefinitionGroup>

0 commit comments

Comments
 (0)