diff --git a/samples/example_app/Makefile b/samples/example_app/Makefile index 096d6859954..882a12bae83 100644 --- a/samples/example_app/Makefile +++ b/samples/example_app/Makefile @@ -56,7 +56,7 @@ ifdef BUILD_WITH_VCPKG -L$(VCPKG_DIR)/lib LIBUI = -lX11 -lXmu -lXrandr -lXxf86vm -lXi - LIBFTGL = -lftgl -lfreetype -lpng -lbz2 -lbrotlidec-static -lbrotlienc-static -lbrotlicommon-static -lz + LIBFTGL = -lftgl -lfreetype -lpng -lbz2 -lbrotlidec -lbrotlienc -lbrotlicommon -lz endif ifdef BUILD_WITH_MINGW @@ -64,7 +64,7 @@ ifdef BUILD_WITH_MINGW LIBGLU = -lglu32 LIBGL= -lopengl32 LIBUI = -lgdi32 -lwinmm - LIBFTGL = -lftgl -lfreetype -lpng -lbz2 -lbrotlidec-static -lbrotlienc-static -lbrotlicommon-static -lz + LIBFTGL = -lftgl -lfreetype -lpng -lbz2 -lbrotlidec -lbrotlienc -lbrotlicommon -lz endif PROGS = uc2 ucn diff --git a/win_build/boinc_ss.vcxproj b/win_build/boinc_ss.vcxproj index 32f2266dc68..c3509f8bb92 100644 --- a/win_build/boinc_ss.vcxproj +++ b/win_build/boinc_ss.vcxproj @@ -132,7 +132,7 @@ ..;%(AdditionalIncludeDirectories) - opengl32.lib;glu32.lib;odbc32.lib;odbccp32.lib;wsock32.lib;psapi.lib;libcmt.lib;libcpmt.lib;freetype.lib;ftgl.lib;libpng16.lib;zlib.lib;bz2.lib;brotlicommon-static.lib;brotlidec-static.lib;%(AdditionalDependencies) + opengl32.lib;glu32.lib;odbc32.lib;odbccp32.lib;wsock32.lib;psapi.lib;libcmt.lib;libcpmt.lib;freetype.lib;ftgl.lib;libpng16.lib;zlib.lib;bz2.lib;brotlicommon.lib;brotlidec.lib;%(AdditionalDependencies) true $(VcpkgInstalledDir)/lib;%(AdditionalLibraryDirectories) false @@ -177,7 +177,7 @@ ..;%(AdditionalIncludeDirectories) - opengl32.lib;glu32.lib;odbc32.lib;odbccp32.lib;wsock32.lib;psapi.lib;libcmt.lib;libcpmt.lib;freetype.lib;ftgl.lib;libpng16.lib;zlib.lib;bz2.lib;brotlicommon-static.lib;brotlidec-static.lib;%(AdditionalDependencies) + opengl32.lib;glu32.lib;odbc32.lib;odbccp32.lib;wsock32.lib;psapi.lib;libcmt.lib;libcpmt.lib;freetype.lib;ftgl.lib;libpng16.lib;zlib.lib;bz2.lib;brotlicommon.lib;brotlidec.lib;%(AdditionalDependencies) true $(VcpkgInstalledDir)/lib;%(AdditionalLibraryDirectories) false @@ -218,7 +218,7 @@ ..;%(AdditionalIncludeDirectories) - libcmtd.lib;libcpmtd.lib;kernel32.lib;user32.lib;shell32.lib;gdi32.lib;opengl32.lib;glu32.lib;ole32.lib;psapi.lib;delayimp.lib;wsock32.lib;advapi32.lib;freetyped.lib;ftgld.lib;libpng16d.lib;zlibd.lib;bz2d.lib;brotlicommon-static.lib;brotlidec-static.lib;%(AdditionalDependencies) + libcmtd.lib;libcpmtd.lib;kernel32.lib;user32.lib;shell32.lib;gdi32.lib;opengl32.lib;glu32.lib;ole32.lib;psapi.lib;delayimp.lib;wsock32.lib;advapi32.lib;freetyped.lib;ftgld.lib;libpng16d.lib;zlibd.lib;bz2d.lib;brotlicommon.lib;brotlidec.lib;%(AdditionalDependencies) true $(VcpkgInstalledDir)/debug/lib;%(AdditionalLibraryDirectories) false @@ -259,7 +259,7 @@ ..;%(AdditionalIncludeDirectories) - libcmtd.lib;libcpmtd.lib;kernel32.lib;user32.lib;shell32.lib;gdi32.lib;opengl32.lib;glu32.lib;ole32.lib;psapi.lib;delayimp.lib;wsock32.lib;advapi32.lib;freetyped.lib;ftgld.lib;libpng16d.lib;zlibd.lib;bz2d.lib;brotlicommon-static.lib;brotlidec-static.lib;%(AdditionalDependencies) + libcmtd.lib;libcpmtd.lib;kernel32.lib;user32.lib;shell32.lib;gdi32.lib;opengl32.lib;glu32.lib;ole32.lib;psapi.lib;delayimp.lib;wsock32.lib;advapi32.lib;freetyped.lib;ftgld.lib;libpng16d.lib;zlibd.lib;bz2d.lib;brotlicommon.lib;brotlidec.lib;%(AdditionalDependencies) true $(VcpkgInstalledDir)/debug/lib;%(AdditionalLibraryDirectories) false diff --git a/win_build/slide_show.vcxproj b/win_build/slide_show.vcxproj index a49fa103da6..d9ec5903d5f 100644 --- a/win_build/slide_show.vcxproj +++ b/win_build/slide_show.vcxproj @@ -126,7 +126,7 @@ 0x0409 - opengl32.lib;glu32.lib;odbc32.lib;odbccp32.lib;psapi.lib;libcmt.lib;libcpmt.lib;oldnames.lib;freetype.lib;ftgl.lib;libpng16.lib;bz2.lib;zlib.lib;brotlicommon-static.lib;brotlidec-static.lib;%(AdditionalDependencies) + opengl32.lib;glu32.lib;odbc32.lib;odbccp32.lib;psapi.lib;libcmt.lib;libcpmt.lib;oldnames.lib;freetype.lib;ftgl.lib;libpng16.lib;bz2.lib;zlib.lib;brotlicommon.lib;brotlidec.lib;%(AdditionalDependencies) true $(VcpkgInstalledDir)/lib;%(AdditionalLibraryDirectories) false @@ -170,7 +170,7 @@ 0x0409 - opengl32.lib;glu32.lib;odbc32.lib;odbccp32.lib;psapi.lib;libcmt.lib;libcpmt.lib;oldnames.lib;freetype.lib;ftgl.lib;libpng16.lib;bz2.lib;zlib.lib;brotlicommon-static.lib;brotlidec-static.lib;%(AdditionalDependencies) + opengl32.lib;glu32.lib;odbc32.lib;odbccp32.lib;psapi.lib;libcmt.lib;libcpmt.lib;oldnames.lib;freetype.lib;ftgl.lib;libpng16.lib;bz2.lib;zlib.lib;brotlicommon.lib;brotlidec.lib;%(AdditionalDependencies) true $(VcpkgInstalledDir)/lib;%(AdditionalLibraryDirectories) false @@ -210,7 +210,7 @@ 0x0409 - libcmtd.lib;libcpmtd.lib;kernel32.lib;user32.lib;gdi32.lib;opengl32.lib;glu32.lib;ole32.lib;oldnames.lib;psapi.lib;delayimp.lib;freetyped.lib;ftgld.lib;libpng16d.lib;bz2d.lib;zlibd.lib;brotlicommon-static.lib;brotlidec-static.lib;%(AdditionalDependencies) + libcmtd.lib;libcpmtd.lib;kernel32.lib;user32.lib;gdi32.lib;opengl32.lib;glu32.lib;ole32.lib;oldnames.lib;psapi.lib;delayimp.lib;freetyped.lib;ftgld.lib;libpng16d.lib;bz2d.lib;zlibd.lib;brotlicommon.lib;brotlidec.lib;%(AdditionalDependencies) true $(VcpkgInstalledDir)/debug/lib;%(AdditionalLibraryDirectories) false @@ -250,7 +250,7 @@ 0x0409 - libcmtd.lib;libcpmtd.lib;kernel32.lib;user32.lib;gdi32.lib;opengl32.lib;glu32.lib;ole32.lib;oldnames.lib;psapi.lib;delayimp.lib;freetyped.lib;ftgld.lib;libpng16d.lib;bz2d.lib;zlibd.lib;brotlicommon-static.lib;brotlidec-static.lib;%(AdditionalDependencies) + libcmtd.lib;libcpmtd.lib;kernel32.lib;user32.lib;gdi32.lib;opengl32.lib;glu32.lib;ole32.lib;oldnames.lib;psapi.lib;delayimp.lib;freetyped.lib;ftgld.lib;libpng16d.lib;bz2d.lib;zlibd.lib;brotlicommon.lib;brotlidec.lib;%(AdditionalDependencies) true $(VcpkgInstalledDir)/debug/lib;%(AdditionalLibraryDirectories) false diff --git a/win_build/uc2_graphics.vcxproj b/win_build/uc2_graphics.vcxproj index 366c5f18a8f..284aa32836d 100644 --- a/win_build/uc2_graphics.vcxproj +++ b/win_build/uc2_graphics.vcxproj @@ -126,7 +126,7 @@ 0x0409 - opengl32.lib;glu32.lib;odbc32.lib;odbccp32.lib;psapi.lib;libcmt.lib;libcpmt.lib;freetype.lib;ftgl.lib;libpng16.lib;bz2.lib;zlib.lib;brotlicommon-static.lib;brotlidec-static.lib;%(AdditionalDependencies) + opengl32.lib;glu32.lib;odbc32.lib;odbccp32.lib;psapi.lib;libcmt.lib;libcpmt.lib;freetype.lib;ftgl.lib;libpng16.lib;bz2.lib;zlib.lib;brotlicommon.lib;brotlidec.lib;%(AdditionalDependencies) true $(VcpkgInstalledDir)/lib;%(AdditionalLibraryDirectories) false @@ -170,7 +170,7 @@ 0x0409 - opengl32.lib;glu32.lib;odbc32.lib;odbccp32.lib;psapi.lib;libcmt.lib;libcpmt.lib;freetype.lib;ftgl.lib;libpng16.lib;bz2.lib;zlib.lib;brotlicommon-static.lib;brotlidec-static.lib;%(AdditionalDependencies) + opengl32.lib;glu32.lib;odbc32.lib;odbccp32.lib;psapi.lib;libcmt.lib;libcpmt.lib;freetype.lib;ftgl.lib;libpng16.lib;bz2.lib;zlib.lib;brotlicommon.lib;brotlidec.lib;%(AdditionalDependencies) true $(VcpkgInstalledDir)/lib;%(AdditionalLibraryDirectories) false @@ -210,7 +210,7 @@ 0x0409 - libcmtd.lib;libcpmtd.lib;kernel32.lib;user32.lib;gdi32.lib;opengl32.lib;glu32.lib;ole32.lib;psapi.lib;delayimp.lib;freetyped.lib;ftgld.lib;libpng16d.lib;bz2d.lib;zlibd.lib;brotlicommon-static.lib;brotlidec-static.lib;%(AdditionalDependencies) + libcmtd.lib;libcpmtd.lib;kernel32.lib;user32.lib;gdi32.lib;opengl32.lib;glu32.lib;ole32.lib;psapi.lib;delayimp.lib;freetyped.lib;ftgld.lib;libpng16d.lib;bz2d.lib;zlibd.lib;brotlicommon.lib;brotlidec.lib;%(AdditionalDependencies) true $(VcpkgInstalledDir)/debug/lib;%(AdditionalLibraryDirectories) false @@ -250,7 +250,7 @@ 0x0409 - libcmtd.lib;libcpmtd.lib;kernel32.lib;user32.lib;gdi32.lib;opengl32.lib;glu32.lib;ole32.lib;psapi.lib;delayimp.lib;freetyped.lib;ftgld.lib;libpng16d.lib;bz2d.lib;zlibd.lib;brotlicommon-static.lib;brotlidec-static.lib;%(AdditionalDependencies) + libcmtd.lib;libcpmtd.lib;kernel32.lib;user32.lib;gdi32.lib;opengl32.lib;glu32.lib;ole32.lib;psapi.lib;delayimp.lib;freetyped.lib;ftgld.lib;libpng16d.lib;bz2d.lib;zlibd.lib;brotlicommon.lib;brotlidec.lib;%(AdditionalDependencies) true $(VcpkgInstalledDir)/debug/lib;%(AdditionalLibraryDirectories) false