Revision: 1578
http://svn.sourceforge.net/complement/?rev=1578&view=rev
Author: complement
Date: 2007-05-31 11:37:14 -0700 (Thu, 31 May 2007)
Log Message:
-----------
use STLport's variant
Modified Paths:
--------------
trunk/complement/explore/Makefiles/gmake/windows/lib.mak
Modified: trunk/complement/explore/Makefiles/gmake/windows/lib.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/windows/lib.mak 2007-05-31 16:12:06 UTC (rev 1577)
+++ trunk/complement/explore/Makefiles/gmake/windows/lib.mak 2007-05-31 18:37:14 UTC (rev 1578)
@@ -1,20 +1,42 @@
-# -*- makefile -*- Time-stamp: <03/07/15 18:23:04 ptr>
+# -*- makefile -*- Time-stamp: <07/05/31 08:56:06 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
#
+# Copyright (c) 2006, 2007
+# Francois Dumont
+#
# Portion Copyright (c) 1999-2001
# Parallel Graphics Ltd.
#
# Licensed under the Academic Free License version 3.0
#
-RELEASE_SUFFIX := r
+ifeq (gcc, $(COMPILER_NAME))
+LIB_PREFIX := lib
+endif
+
+LIB_PREFIX ?=
+ifneq (bcc, $(COMPILER_NAME))
+DBG_SUFFIX := g
+else
DBG_SUFFIX := d
+endif
STLDBG_SUFFIX := stl${DBG_SUFFIX}
+ifdef STLP_BUILD_FORCE_STATIC_RUNTIME
+LIB_TYPE := _x
+else
+LIB_TYPE :=
+endif
+ifdef STLP_BUILD_LIB_MOTIF
+LIB_SUFFIX := _$(STLP_BUILD_LIB_MOTIF).${MAJOR}.${MINOR}
+else
+LIB_SUFFIX := .${MAJOR}.${MINOR}
+endif
+
# Shared libraries:
-SO_NAME_BASE := ${LIBNAME}_${RELEASE_SUFFIX}${MAJOR}${MINOR}
+SO_NAME_BASE := $(LIB_PREFIX)${LIBNAME}${LIB_TYPE}${LIB_SUFFIX}
SO_NAME := ${SO_NAME_BASE}.$(SO)
LIB_NAME := ${SO_NAME_BASE}.$(LIB)
EXP_NAME := ${SO_NAME_BASE}.$(EXP)
@@ -23,7 +45,7 @@
LIB_NAME_OUT := $(OUTPUT_DIR)/${LIB_NAME}
EXP_NAME_OUT := $(OUTPUT_DIR)/${EXP_NAME}
-SO_NAME_DBG_BASE := ${LIBNAME}_${DBG_SUFFIX}${MAJOR}${MINOR}
+SO_NAME_DBG_BASE := $(LIB_PREFIX)${LIBNAME}${DBG_SUFFIX}${LIB_TYPE}${LIB_SUFFIX}
SO_NAME_DBG := ${SO_NAME_DBG_BASE}.$(SO)
LIB_NAME_DBG := ${SO_NAME_DBG_BASE}.$(LIB)
EXP_NAME_DBG := ${SO_NAME_DBG_BASE}.$(EXP)
@@ -32,7 +54,7 @@
LIB_NAME_OUT_DBG := $(OUTPUT_DIR_DBG)/${LIB_NAME_DBG}
EXP_NAME_OUT_DBG := $(OUTPUT_DIR_DBG)/${EXP_NAME_DBG}
-SO_NAME_STLDBG_BASE := ${LIBNAME}_${STLDBG_SUFFIX}${MAJOR}${MINOR}
+SO_NAME_STLDBG_BASE := $(LIB_PREFIX)${LIBNAME}${STLDBG_SUFFIX}${LIB_TYPE}${LIB_SUFFIX}
SO_NAME_STLDBG := ${SO_NAME_STLDBG_BASE}.$(SO)
LIB_NAME_STLDBG := ${SO_NAME_STLDBG_BASE}.$(LIB)
EXP_NAME_STLDBG := ${SO_NAME_STLDBG_BASE}.$(EXP)
@@ -42,11 +64,27 @@
EXP_NAME_OUT_STLDBG := $(OUTPUT_DIR_STLDBG)/${EXP_NAME_STLDBG}
# Static libraries:
-A_NAME := ${SO_NAME_BASE}_static.$(ARCH)
+ifeq (gcc, $(COMPILER_NAME))
+A_LIB_TYPE :=
+else
+ifdef STLP_BUILD_FORCE_DYNAMIC_RUNTIME
+A_LIB_TYPE := _statix
+else
+A_LIB_TYPE := _static
+endif
+endif
+
+ifdef STLP_BUILD_LIB_MOTIF
+LIB_A_SUFFIX := _$(STLP_BUILD_LIB_MOTIF)
+else
+LIB_A_SUFFIX :=
+endif
+
+A_NAME := $(LIB_PREFIX)${LIBNAME}${A_LIB_TYPE}${LIB_A_SUFFIX}.$(ARCH)
A_NAME_OUT := $(OUTPUT_DIR_A)/$(A_NAME)
-A_NAME_DBG := ${SO_NAME_DBG_BASE}_static.$(ARCH)
+A_NAME_DBG := $(LIB_PREFIX)${LIBNAME}${DBG_SUFFIX}${A_LIB_TYPE}${LIB_A_SUFFIX}.${ARCH}
A_NAME_OUT_DBG := $(OUTPUT_DIR_A_DBG)/$(A_NAME_DBG)
-A_NAME_STLDBG := ${SO_NAME_STLDBG_BASE}_static.$(ARCH)
+A_NAME_STLDBG := ${LIB_PREFIX}${LIBNAME}${STLDBG_SUFFIX}${A_LIB_TYPE}${LIB_A_SUFFIX}.${ARCH}
A_NAME_OUT_STLDBG := $(OUTPUT_DIR_A_STLDBG)/$(A_NAME_STLDBG)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
