Workaround for linking with ld.bfd.

Ubuntu (and possibly others) still have the old ld.bfd as default instead of ld.gold, and that fails to recognize the -lz option when it comes too early. So just add it to the end again.
Warzone2100 · Oct 16, 2011 · cd6bb3d · cd6bb3d
1 parent 5839c49
commit cd6bb3d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/po/POTFILES.in b/po/POTFILES.in
@@ -181,6 +181,7 @@ lib/netplay/netplay.cpp
 lib/netplay/netqueue.cpp
 lib/netplay/netsocket.cpp
 lib/netplay/nettypes.cpp
+lib/qtgame/macosx_screen_resolutions.cpp
 lib/qtgame/qtgame.cpp
 lib/qtgame/swapinterval.cpp
 lib/script/codeprint.cpp

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -296,7 +296,7 @@ warzone2100_LIBS = \
 
 warzone2100_LDADD = $(warzone2100_LIBS) $(LTLIBINTL) $(PHYSFS_LIBS) $(PNG_LIBS) $(OGGVORBIS_LIBS) \
 	$(THEORA_LIBS) $(OPENAL_LIBS) $(OPENGLC_LIBS) $(OPENGL_LIBS) $(QT4_LIBS) $(QJSON_LIBS) $(GLEW_LIBS) \
-	$(X_LIBS) $(X_EXTRA_LIBS)
+	$(X_LIBS) $(X_EXTRA_LIBS) $(LDFLAGS)
 
 if MINGW32
 warzone2100_LDADD += $(top_builddir)/win32/warzone2100.o $(WIN32_LIBS)