From 0193d7b0e58aa51bbeffe5a46f3706eb9b989175 Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Wed, 1 May 2013 17:42:03 +0000
Subject: [PATCH] Makefiles: do not pass $(STDCPPLIB) to final
 eduke32/mapster32 linking step.

git-svn-id: https://svn.eduke32.com/eduke32@3720 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/Makefile              |  4 ++--
 polymer/eduke32/build/Makefile.shared | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile
index eefa95d87..9cc92cbc7 100644
--- a/polymer/eduke32/Makefile
+++ b/polymer/eduke32/Makefile
@@ -349,7 +349,7 @@ finish:
 
 $(EDUKE32): $(GAMEOBJS) $(EOBJ)/$(ENGINELIB) $(JAUDIOLIBDIR)/$(JAUDIOLIB) $(ENET_TARGET) $(MISCGAMEDEPS)
 	$(LINK_STATUS)
-	if $(LINKER) -o $@ $^ $(OURLDFLAGS) $(GAMELDFLAGS) $(OURLIBS) $(STATICSTDCPP) $(STDCPPLIB); then $(LINK_OK); else $(LINK_FAILED); fi
+	if $(LINKER) -o $@ $^ $(OURLDFLAGS) $(GAMELDFLAGS) $(OURLIBS) $(STATICSTDCPP); then $(LINK_OK); else $(LINK_FAILED); fi
 ifneq ($(STRIP),)
 	$(STRIP) $(EDUKE32)
 endif
@@ -361,7 +361,7 @@ endif
 
 $(MAPSTER32): $(EDITOROBJS) $(EOBJ)/$(ENGINELIB) $(EOBJ)/$(EDITORLIB) $(JAUDIOLIBDIR)/$(JAUDIOLIB) $(MISCEDITORDEPS)
 	$(LINK_STATUS)
-	if $(LINKER) -o $@ $^ $(OURLDFLAGS) $(EDITORLDFLAGS) $(OURLIBS) $(STATICSTDCPP) $(STDCPPLIB); then $(LINK_OK); else $(LINK_FAILED); fi
+	if $(LINKER) -o $@ $^ $(OURLDFLAGS) $(EDITORLDFLAGS) $(OURLIBS) $(STATICSTDCPP); then $(LINK_OK); else $(LINK_FAILED); fi
 ifneq ($(STRIP),)
 	$(STRIP) $(MAPSTER32)
 endif
diff --git a/polymer/eduke32/build/Makefile.shared b/polymer/eduke32/build/Makefile.shared
index 3d6eb7322..c2f5605e3 100644
--- a/polymer/eduke32/build/Makefile.shared
+++ b/polymer/eduke32/build/Makefile.shared
@@ -57,12 +57,8 @@ BUILDCOMMONFLAGS=$(ARCH)
 BUILDLIBS=
 BUILDLIBDIRS=
 
-ifeq ($(SUBPLATFORM),LINUX)
-    STDCPPLIB:=
-else
-    # Overridden for OSes that don't have the cutdown stdc++ that is supc++
-    STDCPPLIB:=-lsupc++
-endif
+# NOTE: If your setup doesn't have libstdc++, you can try using libsupc++.
+# Search for STDCPPLIB below and change it to -lsupc++.
 
 ifeq ($(SUBPLATFORM),LINUX)
     RENDERTYPE=SDL
@@ -70,6 +66,10 @@ ifeq ($(SUBPLATFORM),LINUX)
     GTKCOMPAT32=0
     SDL_FRAMEWORK=0
 
+    # On Linux, we don't need to specify libstdc++ manually, the linker will
+    # presumably take care for us.
+    STDCPPLIB:=
+
     ifeq ($(findstring x86_64,$(SYSARCH)),x86_64)
         ifeq (1,$(BUILD32_ON_64))
             # On my 64bit Gentoo these are the 32bit emulation libs
@@ -109,7 +109,7 @@ ifeq ($(PLATFORM),WINDOWS)
     BUILDLIBS+= -Wl,--enable-auto-import -mwindows -lmingwex -lcomctl32 -lwinmm $(L_SSP) -lwsock32 -lws2_32 -lshlwapi
     #-lshfolder
     #BUILDLIBDIRS+= -L$(ENETROOT)
-    #STDCPPLIB:=-lstdc++
+    STDCPPLIB:=-lstdc++
     ifeq ($(findstring x86_64,$(SYSARCH)),x86_64)
         ifneq (1,$(BUILD32_ON_64))
             override NOASM=1