Skip to content

Commit c08c659

Browse files
committed
Link RE2 and use non-static dependencies in CI
1 parent c30ac24 commit c08c659

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Setup MSBuild
1818
uses: microsoft/setup-msbuild@v1
1919
- name: Check dependencies
20-
run: 'ls ${{ github.workspace }}/vcpkg/installed/x86-windows-static'
20+
run: 'ls ${{ github.workspace }}/vcpkg/installed/x86-windows'
2121
- name: Build DLL
2222
run: 'msbuild SimpleGraphic.vcxproj /p:configuration=release /p:platform=win32'
2323
- name: Archive DLL

SimpleGraphic.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@
123123
<SubSystem>Windows</SubSystem>
124124
<GenerateDebugInformation>true</GenerateDebugInformation>
125125
<EnableUAC>false</EnableUAC>
126-
<AdditionalLibraryDirectories>$(SolutionDir)vcpkg\installed\x86-windows\lib;$(SolutionDir)vcpkg\installed\x86-windows\debug\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
127-
<AdditionalDependencies>d3d11.lib;d3d9.lib;dxgi.lib;dxguid.lib;libANGLE.lib;libGLESv2.lib;lzma.lib;lua51.lib;zlib.lib;opengl32.lib;winmm.lib;glfw3dll.lib;fmt.lib;%(AdditionalDependencies)</AdditionalDependencies>
126+
<AdditionalLibraryDirectories>$(SolutionDir)vcpkg\installed\x86-windows\lib;$(SolutionDir)vcpkg\installed\x86-windows\debug\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
127+
<AdditionalDependencies>d3d11.lib;d3d9.lib;dxgi.lib;dxguid.lib;libANGLE.lib;libGLESv2.lib;re2.lib;lua51.lib;zlib.lib;opengl32.lib;winmm.lib;glfw3dll.lib;fmt.lib;%(AdditionalDependencies)</AdditionalDependencies>
128128
</Link>
129129
</ItemDefinitionGroup>
130130
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -151,8 +151,8 @@
151151
<OptimizeReferences>true</OptimizeReferences>
152152
<GenerateDebugInformation>true</GenerateDebugInformation>
153153
<EnableUAC>false</EnableUAC>
154-
<AdditionalLibraryDirectories>$(SolutionDir)vcpkg\installed\x86-windows\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
155-
<AdditionalDependencies>d3d11.lib;d3d9.lib;dxgi.lib;dxguid.lib;libANGLE.lib;libGLESv2.lib;lzma.lib;lua51.lib;zlib.lib;opengl32.lib;winmm.lib;glfw3dll.lib;fmt.lib;%(AdditionalDependencies)</AdditionalDependencies>
154+
<AdditionalLibraryDirectories>$(SolutionDir)vcpkg\installed\x86-windows\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
155+
<AdditionalDependencies>d3d11.lib;d3d9.lib;dxgi.lib;dxguid.lib;libANGLE.lib;libGLESv2.lib;re2.lib;lua51.lib;zlib.lib;opengl32.lib;winmm.lib;glfw3dll.lib;fmt.lib;%(AdditionalDependencies)</AdditionalDependencies>
156156
</Link>
157157
</ItemDefinitionGroup>
158158
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

0 commit comments

Comments
 (0)