[complement-svn] SF.net SVN: complement: [1907] branches/complement-sockios/explore/ Makefiles/gmake

[<com...@us...>]

Revision: 1907
          http://complement.svn.sourceforge.net/complement/?rev=1907&view=rev
Author:   complement
Date:     2008-06-25 22:43:01 -0700 (Wed, 25 Jun 2008)

Log Message:
-----------
sync with STLport for cygwin/mingw

Modified Paths:
--------------
    branches/complement-sockios/explore/Makefiles/gmake/app/gcc.mak
    branches/complement-sockios/explore/Makefiles/gmake/lib/gcc.mak

Modified: branches/complement-sockios/explore/Makefiles/gmake/app/gcc.mak
===================================================================
--- branches/complement-sockios/explore/Makefiles/gmake/app/gcc.mak	2008-06-26 05:42:44 UTC (rev 1906)
+++ branches/complement-sockios/explore/Makefiles/gmake/app/gcc.mak	2008-06-26 05:43:01 UTC (rev 1907)
@@ -1,6 +1,6 @@
-# -*- Makefile -*- Time-stamp: <08/06/12 13:54:55 ptr>
+# -*- Makefile -*- Time-stamp: <08/06/12 16:01:09 ptr>
 #
-# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2008
 # Petr Ovtchenkov
 #
 # Portion Copyright (c) 1999-2001
@@ -63,6 +63,7 @@
 
 ifndef WITHOUT_STLPORT
 ifeq (${STLPORT_LIB_DIR},)
+ifneq ($(OSNAME),windows)
 release-shared:	STLPORT_LIB = -lstlport
 release-static:	STLPORT_LIB = -Wl,-Bstatic -lstlport -Wl,-Bdynamic
 dbg-shared:	STLPORT_LIB = -lstlportg
@@ -70,20 +71,27 @@
 stldbg-shared:	STLPORT_LIB = -lstlportstlg
 stldbg-static:	STLPORT_LIB = -Wl,-Bstatic -lstlportstlg -Wl,-Bdynamic
 else
+LIB_VERSION = ${LIBMAJOR}.${LIBMINOR}
+release-shared : STLPORT_LIB = -lstlport.${LIB_VERSION}
+dbg-shared     : STLPORT_LIB = -lstlportg.${LIB_VERSION}
+stldbg-shared  : STLPORT_LIB = -lstlportstlg.${LIB_VERSION}
+endif
+else
+# STLPORT_LIB_DIR not empty
+ifneq ($(OSNAME),windows)
 release-shared:	STLPORT_LIB = -L${STLPORT_LIB_DIR} -lstlport
 release-static:	STLPORT_LIB = -L${STLPORT_LIB_DIR} -Wl,-Bstatic -lstlport -Wl,-Bdynamic
 dbg-shared:	STLPORT_LIB = -L${STLPORT_LIB_DIR} -lstlportg
 dbg-static:	STLPORT_LIB = -L${STLPORT_LIB_DIR} -Wl,-Bstatic -lstlportg -Wl,-Bdynamic
 stldbg-shared:	STLPORT_LIB = -L${STLPORT_LIB_DIR} -lstlportstlg
 stldbg-static:	STLPORT_LIB = -L${STLPORT_LIB_DIR} -Wl,-Bstatic -lstlportstlg -Wl,-Bdynamic
-endif
-
-ifeq ($(OSNAME),windows)
+else
 LIB_VERSION = ${LIBMAJOR}.${LIBMINOR}
-release-shared : STLPORT_LIB = -lstlport.${LIB_VERSION}
-dbg-shared     : STLPORT_LIB = -lstlportg.${LIB_VERSION}
-stldbg-shared  : STLPORT_LIB = -lstlportstlg.${LIB_VERSION}
+release-shared : STLPORT_LIB = -L${STLPORT_LIB_DIR} -lstlport.${LIB_VERSION}
+dbg-shared     : STLPORT_LIB = -L${STLPORT_LIB_DIR} -lstlportg.${LIB_VERSION}
+stldbg-shared  : STLPORT_LIB = -L${STLPORT_LIB_DIR} -lstlportstlg.${LIB_VERSION}
 endif
+endif
 
 endif
 

Modified: branches/complement-sockios/explore/Makefiles/gmake/lib/gcc.mak
===================================================================
--- branches/complement-sockios/explore/Makefiles/gmake/lib/gcc.mak	2008-06-26 05:42:44 UTC (rev 1906)
+++ branches/complement-sockios/explore/Makefiles/gmake/lib/gcc.mak	2008-06-26 05:43:01 UTC (rev 1907)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <08/06/12 14:08:48 ptr>
+# -*- makefile -*- Time-stamp: <08/06/12 15:44:41 ptr>
 #
 # Copyright (c) 1997-1999, 2002, 2003, 2005-2008
 # Petr Ovtchenkov
@@ -73,21 +73,29 @@
 ifndef WITHOUT_STLPORT
 
 ifeq (${STLPORT_LIB_DIR},)
+ifneq ($(OSNAME),windows)
 release-shared:	STLPORT_LIB = -lstlport
 dbg-shared:	STLPORT_LIB = -lstlportg
 stldbg-shared:	STLPORT_LIB = -lstlportstlg
 else
+LIB_VERSION = ${LIBMAJOR}.${LIBMINOR}
+release-shared:	STLPORT_LIB = -lstlport.${LIB_VERSION}
+dbg-shared:	STLPORT_LIB = -lstlportg.${LIB_VERSION}
+stldbg-shared:	STLPORT_LIB = -lstlportstlg.${LIB_VERSION}
+endif
+else
+# STLPORT_LIB_DIR not empty
+ifneq ($(OSNAME),windows)
 release-shared:	STLPORT_LIB = -L${STLPORT_LIB_DIR} -lstlport
 dbg-shared:	STLPORT_LIB = -L${STLPORT_LIB_DIR} -lstlportg
 stldbg-shared:	STLPORT_LIB = -L${STLPORT_LIB_DIR} -lstlportstlg
-endif
-
-ifeq ($(OSNAME),windows)
+else
 LIB_VERSION = ${LIBMAJOR}.${LIBMINOR}
-release-shared : STLPORT_LIB = -lstlport.${LIB_VERSION}
-dbg-shared     : STLPORT_LIB = -lstlportg.${LIB_VERSION}
-stldbg-shared  : STLPORT_LIB = -lstlportstlg.${LIB_VERSION}
+release-shared:	STLPORT_LIB = -L${STLPORT_LIB_DIR} -lstlport.${LIB_VERSION}
+dbg-shared:	STLPORT_LIB = -L${STLPORT_LIB_DIR} -lstlportg.${LIB_VERSION}
+stldbg-shared:	STLPORT_LIB = -L${STLPORT_LIB_DIR} -lstlportstlg.${LIB_VERSION}
 endif
+endif
 
 endif
 
@@ -126,7 +134,7 @@
 _LSUPCPP := $(shell ${CXX} ${CXXFLAGS} -print-file-name=libsupc++.a)
 ifeq (${OSNAME},darwin)
 ifdef GCC_APPLE_CC
-_LSUPCPP := $(shell lipo ${_LSUPCPP} -thin ${M_ARCH} -output $(PRE_OUTPUT_DIR)/libsupc++.a && echo $(PRE_OUTPUT_DIR)/libsupc++.a)
+_LSUPCPP := $(shell mkdir -p $(PRE_OUTPUT_DIR) && lipo ${_LSUPCPP} -thin ${M_ARCH} -output $(PRE_OUTPUT_DIR)/libsupc++.a && echo $(PRE_OUTPUT_DIR)/libsupc++.a)
 endif
 endif
 ifneq (${_LSUPCPP},libsupc++.a)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.