Merge pull request #6 from robryk/static-linking

Fix static linking.
google · Dec 21, 2016 · 431c6c1 · 431c6c1
2 parents 0e49009 + f86b901
commit 431c6c1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/guetzli.make b/guetzli.make
@@ -24,7 +24,7 @@ ifeq ($(config),release)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS +=
   LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -s -lpng -lgflags_nothreads
+  ALL_LDFLAGS += $(LDFLAGS) -s -lpng -lgflags_nothreads -lz
   LINKCMD = $(CXX) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef
@@ -51,7 +51,7 @@ ifeq ($(config),debug)
   ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   LIBS +=
   LDDEPS +=
-  ALL_LDFLAGS += $(LDFLAGS) -lpng -lgflags_nothreads
+  ALL_LDFLAGS += $(LDFLAGS) -lpng -lgflags_nothreads -lz
   LINKCMD = $(CXX) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
   define PREBUILDCMDS
   endef

diff --git a/guetzli.vcxproj b/guetzli.vcxproj
@@ -70,6 +70,7 @@
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
     </Link>
   </ItemDefinitionGroup>
@@ -85,6 +86,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
     </Link>
   </ItemDefinitionGroup>

diff --git a/premake5.lua b/premake5.lua
@@ -13,7 +13,9 @@ workspace "guetzli"
     language "C++"
     includedirs { ".", "third_party/butteraugli" }
     filter "action:gmake"
-      linkoptions { "-lpng", "-lgflags_nothreads" }
+      linkoptions { "-lpng", "-lgflags_nothreads", "-lz" }
+    filter "action:vs*"
+      links { "shlwapi" }
     filter {}
     -- This should work with gflags 2.x. The gflags namespace is absent in
     -- gflags-2.0, which is the version in Ubuntu Trusty package repository.