[complement-svn] SF.net SVN: complement: [1575] trunk/complement/explore/Makefiles
Status: Pre-Alpha
Brought to you by:
complement
Menu
▾
▴
[complement-svn] SF.net SVN: complement: [1575] trunk/complement/explore/Makefiles
|
From: <com...@us...> - 2007-05-31 04:34:04
|
Revision: 1575
http://svn.sourceforge.net/complement/?rev=1575&view=rev
Author: complement
Date: 2007-05-30 21:34:01 -0700 (Wed, 30 May 2007)
Log Message:
-----------
remove bogus OSNAME cygming, replace one by normal windows; BCC and DMC compilers from STLport; HP's aCC options as in STLport
Modified Paths:
--------------
trunk/complement/explore/Makefiles/ChangeLog
trunk/complement/explore/Makefiles/gmake/aCC.mak
trunk/complement/explore/Makefiles/gmake/app/gcc.mak
trunk/complement/explore/Makefiles/gmake/gcc.mak
trunk/complement/explore/Makefiles/gmake/hp-ux/sys.mak
trunk/complement/explore/Makefiles/gmake/hp-ux/targetsys.mak
trunk/complement/explore/Makefiles/gmake/lib/aCC.mak
trunk/complement/explore/Makefiles/gmake/lib/clean.mak
trunk/complement/explore/Makefiles/gmake/lib/gcc.mak
trunk/complement/explore/Makefiles/gmake/sysid.mak
trunk/complement/explore/Makefiles/gmake/targets.mak
trunk/complement/explore/Makefiles/gmake/windows/rules-install-so.mak
trunk/complement/explore/Makefiles/gmake/windows/rules-so.mak
trunk/complement/explore/Makefiles/gmake/windows/sys.mak
trunk/complement/explore/Makefiles/gmake/windows/targetsys.mak
Added Paths:
-----------
trunk/complement/explore/Makefiles/gmake/app/bcc.mak
trunk/complement/explore/Makefiles/gmake/app/dmc.mak
trunk/complement/explore/Makefiles/gmake/bcc.mak
trunk/complement/explore/Makefiles/gmake/dmc.mak
trunk/complement/explore/Makefiles/gmake/lib/bcc.mak
trunk/complement/explore/Makefiles/gmake/lib/dmc.mak
Removed Paths:
-------------
trunk/complement/explore/Makefiles/gmake/cygming/
Modified: trunk/complement/explore/Makefiles/ChangeLog
===================================================================
--- trunk/complement/explore/Makefiles/ChangeLog 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/ChangeLog 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,3 +1,20 @@
+2007-05-31 Petr Ovtchenkov <pt...@is...>
+
+ * gmake/app/gcc.mak, gmake/targets.mak, gmake/windows/rules-so.mak:
+ remove bogus OSNAME cygming, replace one by normal windows;
+
+ * gmake/gcc.mak, gmake/lib/gcc.mak, gmake/sysid.mak: ditto;
+
+ * gmake/windows/rules-install-so.mak, gmake/windows/sys.mak: ditto;
+
+ * gmake/windows/targetsys.mak: ditto;
+
+ * gmake/cygming: removed; use windows instead;
+
+ * dmc.mak, bcc.mak: included from STLport;
+
+ * aCC.mak: use options from STLport, it's more fresh.
+
2007-03-08 Petr Ovtchenkov <pt...@is...>
* make.mak: removed, make except GNU make can't work due to top.mak;
Modified: trunk/complement/explore/Makefiles/gmake/aCC.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/aCC.mak 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/gmake/aCC.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,4 +1,4 @@
-# Time-stamp: <06/11/10 15:54:03 ptr>
+# Time-stamp: <07/05/31 01:07:37 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -9,8 +9,6 @@
# Licensed under the Academic Free License version 3.0
#
-INCLUDES :=
-
ifndef _FORCE_CXX
CXX := aCC
else
@@ -23,13 +21,12 @@
CC := $_FORCE_CC
endif
-CXX_VERSION := $(shell ${CXX} --version | grep ${CXX} | awk '{ print $$3; }')
+CXX_VERSION := $(shell ${CXX} --version 2>&1 | grep ${CXX} | awk '{ print $$6; }')
ifeq ($(CXX_VERSION),)
CXX_VERSION := $(shell ${CXX} --version)
endif
-CXX_VERSION_MAJOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$1; }')
-CXX_VERSION_MINOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$2; }')
-CXX_VERSION_PATCH := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$3; }')
+CXX_VERSION_MAJOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$2; }')
+CXX_VERSION_MINOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$3; }')
DEFS ?=
OPT ?=
@@ -39,8 +36,8 @@
LINK_OUTPUT_OPTION = ${OUTPUT_OPTION}
CPPFLAGS = $(DEFS) $(INCLUDES)
-CFLAGS = -Aa -z $(OPT)
-CXXFLAGS = -Aa -z $(OPT)
+CFLAGS = -Aa +z $(OPT)
+CXXFLAGS = -Aa +z -mt $(OPT)
CDEPFLAGS = -E +Md
CCDEPFLAGS = -E +Md
@@ -65,7 +62,7 @@
#stldbg-static-dep : OPT += -g
#stldbg-shared-dep : OPT += -g
-OPT += +Onolimit +W495,749
+OPT += +W495,749,2186,2191,2340,2430,2550
# dependency output parser (dependencies collector)
Added: trunk/complement/explore/Makefiles/gmake/app/bcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/bcc.mak (rev 0)
+++ trunk/complement/explore/Makefiles/gmake/app/bcc.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -0,0 +1,38 @@
+# -*- Makefile -*- Time-stamp: <07/05/31 01:05:40 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# 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
+#
+
+OPT += -tWC -w-par
+
+LDFLAGS += -ap -Tpe -w -w-dup
+
+START_OBJ = c0x32.obj
+
+install-dbg-shared: install-dbg-shared-tds
+install-stldbg-shared: install-stldbg-shared-tds
+
+install-dbg-static: install-dbg-static-tds
+install-stldbg-static: install-stldbg-static-tds
+
+install-dbg-shared-tds:
+ $(INSTALL_EXE) $(subst /,\,$(OUTPUT_DIR_DBG)/${PRGNAME}.tds $(INSTALL_BIN_DIR_DBG)/)
+
+install-stldbg-shared-tds:
+ $(INSTALL_EXE) $(subst /,\,$(OUTPUT_DIR_STLDBG)/${PRGNAME}.tds $(INSTALL_BIN_DIR_STLDBG)/)
+
+install-dbg-static-tds:
+ $(INSTALL_EXE) $(subst /,\,$(OUTPUT_DIR_DBG)/${PRGNAME}.tds $(INSTALL_BIN_DIR_DBG)/)
+
+install-stldbg-static-tds:
+ $(INSTALL_EXE) $(subst /,\,$(OUTPUT_DIR_STLDBG)/${PRGNAME}.tds $(INSTALL_BIN_DIR_STLDBG)/)
+
Added: trunk/complement/explore/Makefiles/gmake/app/dmc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/dmc.mak (rev 0)
+++ trunk/complement/explore/Makefiles/gmake/app/dmc.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -0,0 +1,80 @@
+# -*- Makefile -*- Time-stamp: <07/05/31 01:05:57 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# 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
+#
+
+CXXFLAGS += -w6 -w7 -w18
+
+stldbg-shared : CXXFLAGS += -HP50
+stldbg-static : CXXFLAGS += -HP50
+
+OPT += -WA
+
+release-shared: LDFLAGS +=
+release-static: LDFLAGS +=
+dbg-shared : LDFLAGS += /CODEVIEW/NOCVPACK
+dbg-static : LDFLAGS += /CODEVIEW/NOCVPACK
+stldbg-shared : LDFLAGS += /CODEVIEW/NOCVPACK
+stldbg-static : LDFLAGS += /CODEVIEW/NOCVPACK
+
+# workaround for stl/config/_auto_link.h
+STL_LIBNAME = stlport
+DBG_SUFFIX := g
+STLDBG_SUFFIX := stlg
+
+ifdef STLP_BUILD_LIB_MOTIF
+LIB_SUFFIX := _$(STLP_BUILD_LIB_MOTIF).${LIBMAJOR}.${LIBMINOR}
+else
+LIB_SUFFIX := .${LIBMAJOR}.${LIBMINOR}
+endif
+
+# Shared libraries:
+ifdef STLP_BUILD_FORCE_STATIC_RUNTIME
+LIB_TYPE := _x
+else
+LIB_TYPE :=
+endif
+
+LIB_NAME := $(LIB_PREFIX)${STL_LIBNAME}${LIB_TYPE}${LIB_SUFFIX}.$(LIB)
+LIB_NAME_DBG := $(LIB_PREFIX)${STL_LIBNAME}${DBG_SUFFIX}${LIB_TYPE}${LIB_SUFFIX}.$(LIB)
+LIB_NAME_STLDBG := $(LIB_PREFIX)${STL_LIBNAME}${STLDBG_SUFFIX}${LIB_TYPE}${LIB_SUFFIX}.$(LIB)
+
+# Static libraries:
+ifdef STLP_BUILD_FORCE_DYNAMIC_RUNTIME
+A_LIB_TYPE := _statix
+else
+A_LIB_TYPE := _static
+endif
+
+A_NAME := $(LIB_PREFIX)${STL_LIBNAME}${A_LIB_TYPE}${LIB_SUFFIX}.$(ARCH)
+A_NAME_DBG := $(LIB_PREFIX)${STL_LIBNAME}${DBG_SUFFIX}${A_LIB_TYPE}${LIB_SUFFIX}.${ARCH}
+A_NAME_STLDBG := ${LIB_PREFIX}${STL_LIBNAME}${STLDBG_SUFFIX}${A_LIB_TYPE}${LIB_SUFFIX}.${ARCH}
+
+ifndef STLP_BUILD_FORCE_STATIC_RUNTIME
+release-shared : LDLIBS += $(CURDIR)\..\..\..\lib\$(LIB_NAME)
+dbg-shared : LDLIBS += $(CURDIR)\..\..\..\lib\$(LIB_NAME_DBG)
+stldbg-shared : LDLIBS += $(CURDIR)\..\..\..\lib\$(LIB_NAME_STLDBG)
+else
+release-shared : LDLIBS += $(CURDIR)\..\..\..\lib\$(A_NAME)
+dbg-shared : LDLIBS += $(CURDIR)\..\..\..\lib\$(A_NAME_DBG)
+stldbg-shared : LDLIBS += $(CURDIR)\..\..\..\lib\$(A_NAME_STLDBG)
+endif
+ifndef STLP_BUILD_FORCE_DYNAMIC_RUNTIME
+release-static : LDLIBS += $(CURDIR)\..\..\..\lib\$(A_NAME)
+dbg-static : LDLIBS += $(CURDIR)\..\..\..\lib\$(A_NAME_DBG)
+stldbg-static : LDLIBS += $(CURDIR)\..\..\..\lib\$(A_NAME_STLDBG)
+else
+release-static : LDLIBS += $(CURDIR)\..\..\..\lib\$(LIB_NAME)
+dbg-static : LDLIBS += $(CURDIR)\..\..\..\lib\$(LIB_NAME_DBG)
+stldbg-static : LDLIBS += $(CURDIR)\..\..\..\lib\$(LIB_NAME_STLDBG)
+endif
+
Modified: trunk/complement/explore/Makefiles/gmake/app/gcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/gcc.mak 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/gmake/app/gcc.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,4 +1,4 @@
-# -*- Makefile -*- Time-stamp: <07/03/08 21:23:42 ptr>
+# -*- Makefile -*- Time-stamp: <07/05/30 23:54:39 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
# Petr Ovtchenkov
@@ -55,7 +55,11 @@
ifeq ($(OSNAME),sunos)
_USE_NOSTDLIB := 1
endif
+
+ifeq ($(OSNAME),darwin)
+_USE_NOSTDLIB := 1
endif
+endif
ifndef WITHOUT_STLPORT
LDSEARCH += -L${STLPORT_LIB_DIR}
@@ -67,14 +71,6 @@
stldbg-shared: STLPORT_LIB = -lstlportstlg
stldbg-static: STLPORT_LIB = -Wl,-Bstatic -lstlportstlg -Wl,-Bdynamic
-
-ifeq ($(OSNAME),cygming)
-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
-
ifeq ($(OSNAME),windows)
LIB_VERSION = ${LIBMAJOR}.${LIBMINOR}
release-shared : STLPORT_LIB = -lstlport.${LIB_VERSION}
@@ -132,6 +128,12 @@
END_OBJ := $(shell for o in crtend.o crtn.o; do ${CXX} -print-file-name=$$o; done)
STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm
endif
+ifeq ($(OSNAME),darwin)
+START_OBJ := -lcrt1.o -lcrt2.o
+END_OBJ :=
+STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lc -lm -lsupc++
+#LDFLAGS += -dynamic
+endif
LDFLAGS += -nostdlib
# endif
else
Added: trunk/complement/explore/Makefiles/gmake/bcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/bcc.mak (rev 0)
+++ trunk/complement/explore/Makefiles/gmake/bcc.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -0,0 +1,175 @@
+# Time-stamp: <07/05/31 01:03:15 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# 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
+#
+
+ALL_TAGS = all-static all-shared
+ifdef LIBNAME
+INSTALL_TAGS = install-static install-shared
+else
+INSTALL_TAGS = install-shared
+endif
+
+CXX := bcc32
+CC := bcc32
+RC := brcc32
+
+DEFS ?=
+OPT ?=
+
+CFLAGS = -q -ff
+CXXFLAGS = -q -ff
+
+OPT += -w-ccc -w-rch -w-ngu -w-inl -w-eff
+
+# release-shared : OPT += -w-inl
+
+ifdef STLP_BUILD_FORCE_DYNAMIC_RUNTIME
+release-static : OPT += -tWR
+dbg-static : OPT += -tWR
+stldbg-static : OPT += -tWR
+endif
+
+ifndef STLP_BUILD_FORCE_STATIC_RUNTIME
+release-shared : OPT += -tWR
+dbg-shared : OPT += -tWR
+stldbg-shared : OPT += -tWR
+endif
+
+ifdef STLP_BUILD_NO_RTTI
+OPT += -RT-
+endif
+
+ifndef STLP_BUILD_NO_THREAD
+OPT += -tWM
+endif
+
+#Add Windows target.
+ifndef STLP_BUILD_WINDOWS_95
+WINVER=0x0410
+else
+WINVER=0x0400
+endif
+release-shared: DEFS += -DWINVER=$(WINVER)
+dbg-shared: DEFS += -DWINVER=$(WINVER)
+stldbg-shared: DEFS += -DWINVER=$(WINVER)
+release-static: DEFS += -DWINVER=$(WINVER)
+dbg-static: DEFS += -DWINVER=$(WINVER)
+stldbg-static: DEFS += -DWINVER=$(WINVER)
+
+OUTPUT_OPTION = -o$@
+LINK_OUTPUT_OPTION = $@
+CPPFLAGS = $(DEFS) $(OPT) $(INCLUDES)
+
+CDEPFLAGS = -E -M
+CCDEPFLAGS = -E -M
+RCFLAGS = -32 -r -i${STLPORT_INCLUDE_DIR} -dCOMP=bcc
+
+release-shared : RCFLAGS += -dBUILD_INFOS="-O2 -vi-"
+dbg-shared : RCFLAGS += -dBUILD=d -dBUILD_INFOS="-R -v -y -D_DEBUG"
+stldbg-shared : RCFLAGS += -dBUILD=stld -dBUILD_INFOS="-R -v -y -D_DEBUG -D_STLP_DEBUG"
+RC_OUTPUT_OPTION = -fo$@
+
+COMPILE.rc = ${RC} ${RCFLAGS}
+LINK.cc = ilink32 $(subst /,\,$(LDFLAGS))
+
+LDFLAGS += -ap -D -Gn -Gi
+
+dbg-static : DEFS += -D_DEBUG
+dbg-shared : DEFS += -D_DEBUG
+stldbg-static : DEFS += -D_DEBUG
+stldbg-shared : DEFS += -D_DEBUG
+
+# STLport DEBUG mode specific defines
+stldbg-static : DEFS += -D_STLP_DEBUG
+stldbg-shared : DEFS += -D_STLP_DEBUG
+stldbg-static-dep : DEFS += -D_STLP_DEBUG
+stldbg-shared-dep : DEFS += -D_STLP_DEBUG
+
+# optimization and debug compiler flags
+release-static : OPT += -O2 -vi-
+release-shared : OPT += -O2 -vi-
+
+dbg-static : OPT += -R -v -y
+dbg-shared : OPT += -R -v -y
+stldbg-static : OPT += -R -v -y
+stldbg-shared : OPT += -R -v -y
+
+LDLIBS += import32.lib kernel32.lib
+ifndef STLP_BUILD_NO_THREAD
+ifndef STLP_BUILD_FORCE_STATIC_RUNTIME
+release-shared : LDLIBS += cw32mti.lib
+dbg-shared : LDLIBS += cw32mti.lib
+stldbg-shared : LDLIBS += cw32mti.lib
+else
+release-shared : LDLIBS += cw32mt.lib
+dbg-shared : LDLIBS += cw32mt.lib
+stldbg-shared : LDLIBS += cw32mt.lib
+endif
+ifndef STLP_BUILD_FORCE_DYNAMIC_RUNTIME
+release-static : LDLIBS += cw32mt.lib
+dbg-static : LDLIBS += cw32mt.lib
+stldbg-static : LDLIBS += cw32mt.lib
+else
+release-static : LDLIBS += cw32mti.lib
+dbg-static : LDLIBS += cw32mti.lib
+stldbg-static : LDLIBS += cw32mti.lib
+endif
+else
+ifndef STLP_BUILD_FORCE_STATIC_RUNTIME
+release-shared : LDLIBS += cw32i.lib
+dbg-shared : LDLIBS += cw32i.lib
+stldbg-shared : LDLIBS += cw32i.lib
+else
+release-shared : LDLIBS += cw32.lib
+dbg-shared : LDLIBS += cw32.lib
+stldbg-shared : LDLIBS += cw32.lib
+endif
+ifndef STLP_BUILD_FORCE_DYNAMIC_RUNTIME
+release-static : LDLIBS += cw32.lib
+dbg-static : LDLIBS += cw32.lib
+stldbg-static : LDLIBS += cw32.lib
+else
+release-static : LDLIBS += cw32i.lib
+dbg-static : LDLIBS += cw32i.lib
+stldbg-static : LDLIBS += cw32i.lib
+endif
+endif
+
+ifndef LIBNAME
+ifdef STLP_BUILD_FORCE_DYNAMIC_RUNTIME
+release-static: DEFS += -D_STLP_USE_STATIC_LIB
+dbg-static: DEFS += -D_STLP_USE_STATIC_LIB
+stldbg-static: DEFS += -D_STLP_USE_STATIC_LIB
+endif
+ifdef STLP_BUILD_FORCE_STATIC_RUNTIME
+release-shared: DEFS += -D_STLP_USE_DYNAMIC_LIB
+dbg-shared: DEFS += -D_STLP_USE_DYNAMIC_LIB
+stldbg-shared: DEFS += -D_STLP_USE_DYNAMIC_LIB
+endif
+endif
+
+# map output option (see build/Makefiles/gmake/dmc.mak)
+
+MAP_OUTPUT_OPTION =
+
+# dependency output parser (dependencies collector)
+
+DP_OUTPUT_DIR = | sed 's|\($*\)\.o[ :]*|$(OUTPUT_DIR)/\1.o $@ : |g' > $@; \
+ [ -s $@ ] || rm -f $@
+
+DP_OUTPUT_DIR_DBG = | sed 's|\($*\)\.o[ :]*|$(OUTPUT_DIR_DBG)/\1.o $@ : |g' > $@; \
+ [ -s $@ ] || rm -f $@
+
+DP_OUTPUT_DIR_STLDBG = | sed 's|\($*\)\.o[ :]*|$(OUTPUT_DIR_STLDBG)/\1.o $@ : |g' > $@; \
+ [ -s $@ ] || rm -f $@
+
Added: trunk/complement/explore/Makefiles/gmake/dmc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/dmc.mak (rev 0)
+++ trunk/complement/explore/Makefiles/gmake/dmc.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -0,0 +1,145 @@
+# Time-stamp: <07/05/31 01:03:50 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# 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
+#
+
+ALL_TAGS = all-static all-shared
+ifdef LIBNAME
+INSTALL_TAGS = install-static install-shared
+endif
+
+CXX := dmc
+CC := dmc
+RC := rcc
+
+DEFS ?=
+OPT ?=
+
+CFLAGS = -Ae -C -p -3 -w6 -w12
+CXXFLAGS = -Ae -C -p -3 -w12
+
+DEFS += -DSTRICT
+
+ifdef STLP_BUILD_FORCE_DYNAMIC_RUNTIME
+release-static : OPT += -ND
+dbg-static : OPT += -ND
+stldbg-static : OPT += -ND
+endif
+
+ifndef STLP_BUILD_FORCE_STATIC_RUNTIME
+release-shared : OPT += -ND
+dbg-shared : OPT += -ND
+stldbg-shared : OPT += -ND
+endif
+
+ifndef STLP_BUILD_NO_RTTI
+OPT += -Ar
+endif
+
+#Add Windows target.
+ifndef STLP_BUILD_WINDOWS_95
+WINVER=0x0410
+else
+WINVER=0x0400
+endif
+release-shared: DEFS += -DWINVER=$(WINVER)
+dbg-shared: DEFS += -DWINVER=$(WINVER)
+stldbg-shared: DEFS += -DWINVER=$(WINVER)
+release-static: DEFS += -DWINVER=$(WINVER)
+dbg-static: DEFS += -DWINVER=$(WINVER)
+stldbg-static: DEFS += -DWINVER=$(WINVER)
+
+OUTPUT_OPTION = -o$@
+LINK_OUTPUT_OPTION = $(subst /,\,$@)
+CPPFLAGS = $(DEFS) $(OPT) $(INCLUDES)
+
+CDEPFLAGS = -E -M
+CCDEPFLAGS = -E -M
+RCFLAGS = -32 -I${STLPORT_INCLUDE_DIR} -DCOMP=dmc
+
+release-shared : RCFLAGS += -DBUILD=r -DBUILD_INFOS="-o"
+dbg-shared : RCFLAGS += -DBUILD=g -DBUILD_INFOS="-gl -D_DEBUG"
+stldbg-shared : RCFLAGS += -DBUILD=stlg -DBUILD_INFOS="-gl -D_STLP_DEBUG"
+RC_OUTPUT_OPTION = $(OUTPUT_OPTION)
+
+COMPILE.rc = ${RC} ${RCFLAGS}
+LINK.cc = dm_link $(LDFLAGS)
+
+LDLIBS += user32.lib kernel32.lib
+
+# STLport DEBUG mode specific defines
+dbg-static : DEFS += -D_DEBUG
+dbg-shared : DEFS += -D_DEBUG
+stldbg-static : DEFS += -D_DEBUG
+stldbg-shared : DEFS += -D_DEBUG
+dbg-static-dep : DEFS += -D_DEBUG
+dbg-shared-dep : DEFS += -D_DEBUG
+stldbg-static : DEFS += -D_STLP_DEBUG
+stldbg-shared : DEFS += -D_STLP_DEBUG
+stldbg-static-dep : DEFS += -D_STLP_DEBUG
+stldbg-shared-dep : DEFS += -D_STLP_DEBUG
+
+# optimization and debug compiler flags
+release-static : OPT += -o
+release-shared : OPT += -o
+dbg-static : OPT += -gl
+dbg-shared : OPT += -gl
+stldbg-static : OPT += -gl
+stldbg-shared : OPT += -gl
+
+release-static : OPT += -D_MT
+dbg-static : OPT += -D_MT
+stldbg-static : OPT += -D_MT
+
+release-static : AR += -p128
+dbg-static : AR += -p512
+stldbg-static : AR += -p512
+
+ifndef LIBNAME
+ifdef STLP_BUILD_FORCE_DYNAMIC_RUNTIME
+release-static: DEFS += -D_STLP_USE_STATIC_LIB
+dbg-static: DEFS += -D_STLP_USE_STATIC_LIB
+stldbg-static: DEFS += -D_STLP_USE_STATIC_LIB
+endif
+ifdef STLP_BUILD_FORCE_STATIC_RUNTIME
+release-shared: DEFS += -D_STLP_USE_DYNAMIC_LIB
+dbg-shared: DEFS += -D_STLP_USE_DYNAMIC_LIB
+stldbg-shared: DEFS += -D_STLP_USE_DYNAMIC_LIB
+endif
+endif
+
+# map output option (move map files to output dir)
+
+ifdef LIBNAME
+release-shared: MAP_OUTPUT_OPTION = $(subst /,\,$(OUTPUT_DIR))\$(SO_NAME_BASE).map
+dbg-shared: MAP_OUTPUT_OPTION = $(subst /,\,$(OUTPUT_DIR_DBG))\$(SO_NAME_DBG_BASE).map
+stldbg-shared: MAP_OUTPUT_OPTION = $(subst /,\,$(OUTPUT_DIR_STLDBG))\$(SO_NAME_STLDBG_BASE).map
+else
+release-shared: MAP_OUTPUT_OPTION = $(subst /,\,$(OUTPUT_DIR))\$(PRGNAME).map
+release-static: MAP_OUTPUT_OPTION = $(subst /,\,$(OUTPUT_DIR))\$(PRGNAME).map
+dbg-shared: MAP_OUTPUT_OPTION = $(subst /,\,$(OUTPUT_DIR_DBG))\$(PRGNAME).map
+dbg-static: MAP_OUTPUT_OPTION = $(subst /,\,$(OUTPUT_DIR_DBG))\$(PRGNAME).map
+stldbg-shared: MAP_OUTPUT_OPTION = $(subst /,\,$(OUTPUT_DIR_STLDBG))\$(PRGNAME).map
+stldbg-static: MAP_OUTPUT_OPTION = $(subst /,\,$(OUTPUT_DIR_STLDBG))\$(PRGNAME).map
+endif
+
+# dependency output parser (dependencies collector)
+
+DP_OUTPUT_DIR = | sed 's|\($*\)\.o[ :]*|$(OUTPUT_DIR)/\1.o $@ : |g' > $@; \
+ [ -s $@ ] || rm -f $@
+
+DP_OUTPUT_DIR_DBG = | sed 's|\($*\)\.o[ :]*|$(OUTPUT_DIR_DBG)/\1.o $@ : |g' > $@; \
+ [ -s $@ ] || rm -f $@
+
+DP_OUTPUT_DIR_STLDBG = | sed 's|\($*\)\.o[ :]*|$(OUTPUT_DIR_STLDBG)/\1.o $@ : |g' > $@; \
+ [ -s $@ ] || rm -f $@
+
Modified: trunk/complement/explore/Makefiles/gmake/gcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/gcc.mak 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/gmake/gcc.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,4 +1,4 @@
-# Time-stamp: <06/11/10 15:53:35 ptr>
+# Time-stamp: <07/05/31 01:25:52 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -21,7 +21,7 @@
CC := $_FORCE_CC
endif
-ifeq ($(OSNAME), cygming)
+ifeq ($(OSNAME), windows)
RC := windres
endif
@@ -37,7 +37,13 @@
CXX_VERSION_MAJOR := $(shell ${CXX} -dumpversion | awk 'BEGIN { FS = "."; } { print $1; }')
CXX_VERSION_MINOR := $(shell ${CXX} -dumpversion | awk 'BEGIN { FS = "."; } { print $2; }')
CXX_VERSION_PATCH := $(shell ${CXX} -dumpversion | awk 'BEGIN { FS = "."; } { print $3; }')
+# This is to differentiate Apple-builded compiler from original
+# compiler (it's has different behaviour)
+ifneq ("$(shell ${CXX} -v 2>&1 | grep Apple)", "")
+GCC_APPLE_CC := 1
+endif
else
+ifneq ($(OSNAME), windows)
CXX_VERSION := $(shell ${CXX} --version | grep GCC | awk '{ print $$3; }')
ifeq ($(CXX_VERSION),)
@@ -49,6 +55,7 @@
CXX_VERSION_MINOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$2; }')
CXX_VERSION_PATCH := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$3; }')
endif
+endif
DEFS ?=
OPT ?=
@@ -63,12 +70,13 @@
LINK_OUTPUT_OPTION = ${OUTPUT_OPTION}
CPPFLAGS = $(DEFS) $(INCLUDES)
-ifeq ($(OSNAME), cygming)
-release-shared : RCFLAGS = --include-dir=${STLPORT_INCLUDE_DIR} -DCOMP=gcc -DBUILD=r -DBUILD_INFOS="-O2" --output-format coff
-dbg-shared : RCFLAGS = --include-dir=${STLPORT_INCLUDE_DIR} -DCOMP=gcc -DBUILD=d -DBUILD_INFOS="-g" --output-format coff
-stldbg-shared : RCFLAGS = --include-dir=${STLPORT_INCLUDE_DIR} -DCOMP=gcc -DBUILD=stld -DBUILD_INFOS="-g -D_STLP_DEBUG" --output-format coff
+ifeq ($(OSNAME), windows)
+RCFLAGS = --include-dir=${STLPORT_INCLUDE_DIR} --output-format coff -DCOMP=gcc
+release-shared : RCFLAGS += -DBUILD_INFOS=-O2
+dbg-shared : RCFLAGS += -DBUILD=g -DBUILD_INFOS=-g
+stldbg-shared : RCFLAGS += -DBUILD=stlg -DBUILD_INFOS="-g -D_STLP_DEBUG"
RC_OUTPUT_OPTION = -o $@
-CXXFLAGS = -Wall -Wsign-promo -fexceptions -fident
+CXXFLAGS = -Wall -Wsign-promo -Wcast-qual -fexceptions -fident
ifeq ($(OSREALNAME), mingw)
CCFLAGS += -mthreads
CFLAGS += -mthreads
@@ -80,21 +88,22 @@
CFLAGS += $(OPT)
CXXFLAGS += $(OPT)
COMPILE.rc = $(RC) $(RCFLAGS)
+
+#Add Windows target.
+ifdef STLP_BUILD_WINDOWS_95
+WINVER=0x0400
+else
+WINVER=0x0410
endif
-ifeq ($(OSNAME), windows)
-release-shared : RCFLAGS = --include-dir=${STLPORT_INCLUDE_DIR} -DCOMP=gcc -DBUILD=r -DBUILD_INFOS="-O2" --output-format coff
-dbg-shared : RCFLAGS = --include-dir=${STLPORT_INCLUDE_DIR} -DCOMP=gcc -DBUILD=d -DBUILD_INFOS="-g" --output-format coff
-stldbg-shared : RCFLAGS = --include-dir=${STLPORT_INCLUDE_DIR} -DCOMP=gcc -DBUILD=stld -DBUILD_INFOS="-g -D_STLP_DEBUG" --output-format coff
-RC_OUTPUT_OPTION = -o $@
-CXXFLAGS = -Wall -Wsign-promo -fexceptions -fident
-CCFLAGS += -mthreads
-CFLAGS += -mthreads
-CXXFLAGS += -mthreads
-CCFLAGS += $(OPT)
-CFLAGS += $(OPT)
-CXXFLAGS += $(OPT)
-COMPILE.rc = $(RC) $(RCFLAGS)
+release-static : DEFS += -D_STLP_USE_STATIC_LIB -DWINVER=$(WINVER)
+dbg-static : DEFS += -D_DEBUG -D_STLP_USE_STATIC_LIB -DWINVER=$(WINVER)
+stldbg-static : DEFS += -D_DEBUG -D_STLP_USE_STATIC_LIB -DWINVER=$(WINVER)
+
+release-shared: DEFS += -DWINVER=$(WINVER)
+dbg-shared : DEFS += -D_DEBUG -DWINVER=$(WINVER)
+stldbg-shared : DEFS += -D_DEBUG -DWINVER=$(WINVER)
+
endif
ifeq ($(OSNAME),sunos)
@@ -159,15 +168,11 @@
endif
# Required for correct order of static objects dtors calls:
-ifneq ($(OSNAME),cygming)
-ifneq ($(OSNAME),windows)
-ifneq ($(OSNAME),darwin)
+ifeq ("$(findstring $(OSNAME),darwin windows)","")
ifneq ($(CXX_VERSION_MAJOR),2)
CXXFLAGS += -fuse-cxa-atexit
endif
endif
-endif
-endif
# Code should be ready for this option
#ifneq ($(OSNAME),windows)
Modified: trunk/complement/explore/Makefiles/gmake/hp-ux/sys.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/hp-ux/sys.mak 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/gmake/hp-ux/sys.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,10 +1,21 @@
-# Time-stamp: <05/09/09 21:12:16 ptr>
-# $Id$
+# Time-stamp: <07/05/31 00:47:11 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# 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
+#
-INSTALL := $$HOME/bin/install-sh
+INSTALL := cp
-INSTALL_SO := ${INSTALL} -c -m 0755
-INSTALL_A := ${INSTALL} -c -m 0644
-INSTALL_EXE := ${INSTALL} -c -m 0755
+INSTALL_SO := ${INSTALL}
+INSTALL_A := ${INSTALL}
+INSTALL_EXE := ${INSTALL}
EXT_TEST := /usr/bin/test
Modified: trunk/complement/explore/Makefiles/gmake/hp-ux/targetsys.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/hp-ux/targetsys.mak 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/gmake/hp-ux/targetsys.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,5 +1,13 @@
-# Time-stamp: <05/09/09 21:05:18 ptr>
-# $Id$
+# Time-stamp: <07/05/31 00:48:27 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
SO := sl
Modified: trunk/complement/explore/Makefiles/gmake/lib/aCC.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/aCC.mak 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/gmake/lib/aCC.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <07/03/08 21:38:16 ptr>
+# -*- makefile -*- Time-stamp: <07/05/31 00:50:40 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
# Petr Ovtchenkov
@@ -9,6 +9,6 @@
# Licensed under the Academic Free License version 3.0
#
-dbg-shared: LDFLAGS += -shared -Wl,-C20 -Wl,-dynamic -Wl,+h$(SO_NAME_DBGxx) ${LDSEARCH}
-stldbg-shared: LDFLAGS += -shared -Wl,-C20 -Wl,-dynamic -Wl,+h$(SO_NAME_STLDBGxx) ${LDSEARCH}
-release-shared: LDFLAGS += -shared -Wl,-C20 -Wl,-dynamic -Wl,+h$(SO_NAMExx) ${LDSEARCH}
+dbg-shared: LDFLAGS += -b +nostl -Wl,+h$(SO_NAME_DBGxx) ${LDSEARCH}
+stldbg-shared: LDFLAGS += -b +nostl -Wl,+h$(SO_NAME_STLDBGxx) ${LDSEARCH}
+release-shared: LDFLAGS += -b +nostl -Wl,+h$(SO_NAMExx) ${LDSEARCH}
Added: trunk/complement/explore/Makefiles/gmake/lib/bcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/bcc.mak (rev 0)
+++ trunk/complement/explore/Makefiles/gmake/lib/bcc.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -0,0 +1,35 @@
+# -*- makefile -*- Time-stamp: <07/05/31 01:29:22 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# 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-shared : OPT += -tWD
+dbg-shared : OPT += -tWD
+stldbg-shared : OPT += -tWD
+
+release-shared : LDFLAGS += -Tpd -V4.00 -w -w-dup
+dbg-shared : LDFLAGS += -Tpd -V4.00 -v -w -w-dup
+stldbg-shared : LDFLAGS += -Tpd -V4.00 -v -w -w-dup
+
+START_OBJ := c0d32.obj
+
+install-dbg-shared: install-dbg-shared-tds
+install-stldbg-shared: install-stldbg-shared-tds
+
+TDS_LIBNAME_DBG := $(LIB_PREFIX)${LIBNAME}${DBG_SUFFIX}${LIB_TYPE}${LIB_SUFFIX}.tds
+TDS_LIBNAME_STLDBG := $(LIB_PREFIX)${LIBNAME}${STLDBG_SUFFIX}${LIB_TYPE}${LIB_SUFFIX}.tds
+
+install-dbg-shared-tds:
+ $(INSTALL_SO) $(subst /,\,$(OUTPUT_DIR_DBG)/${TDS_LIBNAME_DBG} $(INSTALL_BIN_DIR)/)
+
+install-stldbg-shared-tds:
+ $(INSTALL_SO) $(subst /,\,$(OUTPUT_DIR_STLDBG)/${TDS_LIBNAME_STLDBG} $(INSTALL_BIN_DIR)/)
Modified: trunk/complement/explore/Makefiles/gmake/lib/clean.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/clean.mak 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/gmake/lib/clean.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <06/11/17 00:39:31 ptr>
+# -*- makefile -*- Time-stamp: <07/05/30 23:55:47 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -26,7 +26,7 @@
@-rm -f $${$(1)_A_NAME_OUT}
@-rm -f $${$(1)_A_NAME_OUT_DBG}
@-rm -f $${$(1)_A_NAME_OUT_STLDBG}
-ifeq ($(OSNAME), cygming)
+ifeq ($(OSNAME), windows)
@-rm -f $${$(1)_LIB_NAME_OUT}
@-rm -f $${$(1)_LIB_NAME_OUT_DBG}
@-rm -f $${$(1)_LIB_NAME_OUT_STLDBG}
@@ -73,7 +73,7 @@
@-rm -f ${A_NAME_OUT}
@-rm -f ${A_NAME_OUT_DBG}
@-rm -f ${A_NAME_OUT_STLDBG}
-ifeq ($(OSNAME), cygming)
+ifeq ($(OSNAME), windows)
@-rm -f ${LIB_NAME_OUT}
@-rm -f ${LIB_NAME_OUT_DBG}
@-rm -f ${LIB_NAME_OUT_STLDBG}
Added: trunk/complement/explore/Makefiles/gmake/lib/dmc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/dmc.mak (rev 0)
+++ trunk/complement/explore/Makefiles/gmake/lib/dmc.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -0,0 +1,25 @@
+# -*- makefile -*- Time-stamp: <07/05/31 01:29:36 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# 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-shared: OPT += -WD
+dbg-shared: OPT += -WD
+stldbg-shared: OPT += -WD
+
+release-shared: LDFLAGS += /IMPLIB:$(subst /,\,$(OUTPUT_DIR))\$(SO_NAME_BASE).lib
+dbg-shared: LDFLAGS += /CODEVIEW/IMPLIB:$(subst /,\,$(OUTPUT_DIR_DBG))\$(SO_NAME_DBG_BASE).lib
+stldbg-shared: LDFLAGS += /CODEVIEW/IMPLIB:$(subst /,\,$(OUTPUT_DIR_STLDBG))\$(SO_NAME_STLDBG_BASE).lib
+
+DEF_OPTION = $(subst /,\,$(OUTPUT_DIR))\$(SO_NAME_BASE).def
+DEF_OPTION_DBG = $(subst /,\,$(OUTPUT_DIR_DBG))\$(SO_NAME_DBG_BASE).def
+DEF_OPTION_STLDBG = $(subst /,\,$(OUTPUT_DIR_STLDBG))\$(SO_NAME_STLDBG_BASE).def
Modified: trunk/complement/explore/Makefiles/gmake/lib/gcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/gcc.mak 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/gmake/lib/gcc.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <07/03/08 21:26:20 ptr>
+# -*- makefile -*- Time-stamp: <07/05/31 00:55:13 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
# Petr Ovtchenkov
@@ -14,7 +14,9 @@
# tag with assignment fail, but work assignment for all tags
# (really that more correct).
+ifneq ($(OSNAME), windows)
OPT += -fPIC
+endif
ifndef NOT_USE_NOSTDLIB
@@ -62,7 +64,11 @@
ifeq ($(OSNAME),sunos)
_USE_NOSTDLIB := 1
endif
+
+ifeq ($(OSNAME),darwin)
+_USE_NOSTDLIB := 1
endif
+endif
ifndef WITHOUT_STLPORT
LDSEARCH += -L${STLPORT_LIB_DIR}
@@ -71,13 +77,6 @@
dbg-shared: STLPORT_LIB = -lstlportg
stldbg-shared: STLPORT_LIB = -lstlportstlg
-ifeq ($(OSNAME),cygming)
-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
-
ifeq ($(OSNAME),windows)
LIB_VERSION = ${LIBMAJOR}.${LIBMINOR}
release-shared : STLPORT_LIB = -lstlport.${LIB_VERSION}
@@ -139,6 +138,16 @@
END_OBJ := $(shell for o in crtend.o crtn.o; do ${CXX} -print-file-name=$$o; done)
STDLIBS := ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm -lrt
endif
+ifeq ($(OSNAME),darwin)
+START_OBJ :=
+END_OBJ :=
+ifdef GCC_APPLE_CC
+STDLIBS := ${STLPORT_LIB} -lgcc -lc -lm
+else
+LDFLAGS += -single_module
+STDLIBS := ${STLPORT_LIB} ${_LGCC_S} -lc -lm
+endif
+endif
#END_A_OBJ := $(shell for o in crtn.o; do ${CXX} -print-file-name=$$o; done)
NOSTDLIB := -nostdlib
# endif
@@ -151,9 +160,9 @@
endif
ifeq ($(OSNAME),hp-ux)
-dbg-shared: LDFLAGS += -shared -Wl,-C20 -Wl,-dynamic -Wl,+h$(SO_NAME_DBGxx) ${LDSEARCH}
-stldbg-shared: LDFLAGS += -shared -Wl,-C20 -Wl,-dynamic -Wl,+h$(SO_NAME_STLDBGxx) ${LDSEARCH}
-release-shared: LDFLAGS += -shared -Wl,-C20 -Wl,-dynamic -Wl,+h$(SO_NAMExx) ${LDSEARCH}
+dbg-shared: LDFLAGS += -shared -Wl,-dynamic -Wl,+h$(SO_NAME_DBGxx) ${LDSEARCH}
+stldbg-shared: LDFLAGS += -shared -Wl,-dynamic -Wl,+h$(SO_NAME_STLDBGxx) ${LDSEARCH}
+release-shared: LDFLAGS += -shared -Wl,-dynamic -Wl,+h$(SO_NAMExx) ${LDSEARCH}
endif
ifeq ($(OSNAME),sunos)
@@ -174,11 +183,10 @@
release-static: LDFLAGS += ${LDSEARCH}
endif
-ifeq ($(OSNAME),cygming)
-OPT :=
-dbg-shared: LDFLAGS += -shared -Wl,--out-implib=${LIB_NAME_OUT_DBG},--export-all-symbols,--disable-auto-import
-stldbg-shared: LDFLAGS += -shared -Wl,--out-implib=${LIB_NAME_OUT_STLDBG},--export-all-symbols
-release-shared: LDFLAGS += -shared -Wl,--out-implib=${LIB_NAME_OUT},--export-all-symbols
+ifeq ($(OSNAME),windows)
+dbg-shared: LDFLAGS += -shared -Wl,--out-implib=${LIB_NAME_OUT_DBG},--enable-auto-image-base
+stldbg-shared: LDFLAGS += -shared -Wl,--out-implib=${LIB_NAME_OUT_STLDBG},--enable-auto-image-base
+release-shared: LDFLAGS += -shared -Wl,--out-implib=${LIB_NAME_OUT},--enable-auto-image-base
dbg-static: LDFLAGS += -static ${LDSEARCH}
stldbg-static: LDFLAGS += -static ${LDSEARCH}
release-static: LDFLAGS += -static ${LDSEARCH}
@@ -197,9 +205,9 @@
CURRENT_VERSION := ${MAJOR}.${MINOR}.${PATCH}
COMPATIBILITY_VERSION := $(CURRENT_VERSION)
-dbg-shared: LDFLAGS += -dynamiclib -compatibility_version $(COMPATIBILITY_VERSION) -current_version $(CURRENT_VERSION) -install_name $(SO_NAME_DBGxx) -Wl ${LDSEARCH}
-stldbg-shared: LDFLAGS += -dynamiclib -compatibility_version $(COMPATIBILITY_VERSION) -current_version $(CURRENT_VERSION) -install_name $(SO_NAME_STLDBGxx) -Wl ${LDSEARCH}
-release-shared: LDFLAGS += -dynamiclib -compatibility_version $(COMPATIBILITY_VERSION) -current_version $(CURRENT_VERSION) -install_name $(SO_NAMExx) -Wl ${LDSEARCH}
+dbg-shared: LDFLAGS += -dynamic -dynamiclib -compatibility_version $(COMPATIBILITY_VERSION) -current_version $(CURRENT_VERSION) -install_name $(SO_NAME_DBGxx) ${LDSEARCH} ${NOSTDLIB}
+stldbg-shared: LDFLAGS += -dynamic -dynamiclib -compatibility_version $(COMPATIBILITY_VERSION) -current_version $(CURRENT_VERSION) -install_name $(SO_NAME_STLDBGxx) ${LDSEARCH} ${NOSTDLIB}
+release-shared: LDFLAGS += -dynamic -dynamiclib -compatibility_version $(COMPATIBILITY_VERSION) -current_version $(CURRENT_VERSION) -install_name $(SO_NAMExx) ${LDSEARCH} ${NOSTDLIB}
dbg-static: LDFLAGS += -staticlib ${LDSEARCH}
stldbg-static: LDFLAGS += -staticlib ${LDSEARCH}
release-static: LDFLAGS += -staticlib ${LDSEARCH}
Modified: trunk/complement/explore/Makefiles/gmake/sysid.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/sysid.mak 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/gmake/sysid.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,4 +1,4 @@
-# Time-stamp: <07/03/08 21:43:48 ptr>
+# Time-stamp: <07/05/30 23:51:19 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
# Petr Ovtchenkov
@@ -17,12 +17,12 @@
# RedHat use nonstandard options for uname at least in cygwin,
# macro should be overwritten:
ifeq (cygwin,$(findstring cygwin,$(OSNAME)))
-OSNAME := cygming
+OSNAME := windows
OSREALNAME := $(shell uname -o | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-')
endif
ifeq (mingw,$(findstring mingw,$(OSNAME)))
-OSNAME := cygming
+OSNAME := windows
OSREALNAME := mingw
endif
@@ -61,12 +61,12 @@
# RedHat use nonstandard options for uname at least in cygwin,
# macro should be overwritten:
ifeq (cygwin,$(findstring cygwin,$(BUILD_OSNAME)))
-BUILD_OSNAME := cygming
+BUILD_OSNAME := windows
BUILD_OSREALNAME := $(shell uname -o | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-')
endif
ifeq (mingw,$(findstring mingw,$(BUILD_OSNAME)))
-BUILD_OSNAME := cygming
+BUILD_OSNAME := windows
BUILD_OSREALNAME := mingw
endif
Modified: trunk/complement/explore/Makefiles/gmake/targets.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/targets.mak 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/gmake/targets.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,4 +1,4 @@
-# Time-stamp: <06/11/17 10:29:59 ptr>
+# Time-stamp: <07/05/30 23:59:42 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -46,7 +46,7 @@
# if sources disposed in several dirs, calculate appropriate rules
DIRS_UNIQUE_SRC := $(dir $(SRC_CPP) $(SRC_CC) $(SRC_CXX) $(SRC_C) $(SRC_S) )
-ifeq (${OSNAME},cygming)
+ifeq (${OSNAME},windows)
DIRS_UNIQUE_SRC := ${DIRS_UNIQUE_SRC} $(dir $(SRC_RC) )
endif
DIRS_UNIQUE_SRC := $(sort $(DIRS_UNIQUE_SRC) $(PRGS_DIR_SRC))
@@ -111,7 +111,7 @@
$(call rule_o,_A_STLDBG,$(1))
endif
endif
-ifeq ($(OSNAME),cygming)
+ifeq ($(OSNAME),windows)
$(call rule_rc,,$(1))
$(call rule_rc,_DBG,$(1))
ifndef WITHOUT_STLPORT
@@ -123,7 +123,7 @@
$(foreach dir,$(DIRS_UNIQUE_SRC),$(eval $(call rules_,$(dir))))
ALLBASE := $(basename $(notdir $(SRC_CC) $(SRC_CPP) $(SRC_CXX) $(SRC_C) $(SRC_S)))
-ifeq (${OSNAME},cygming)
+ifeq (${OSNAME},windows)
RCBASE += $(basename $(notdir $(SRC_RC)))
endif
Modified: trunk/complement/explore/Makefiles/gmake/windows/rules-install-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/windows/rules-install-so.mak 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/gmake/windows/rules-install-so.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,5 +1,16 @@
-# -*- makefile -*- Time-stamp: <03/07/15 18:26:22 ptr>
-# $Id$
+# -*- makefile -*- Time-stamp: <07/05/31 00:12:45 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# 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
+#
INSTALL_TAGS ?= install-shared
Modified: trunk/complement/explore/Makefiles/gmake/windows/rules-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/windows/rules-so.mak 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/gmake/windows/rules-so.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,5 +1,16 @@
-# -*- makefile -*- Time-stamp: <03/10/27 18:15:05 ptr>
-# $Id$
+# -*- makefile -*- Time-stamp: <07/05/31 00:13:32 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# 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
+#
# Shared libraries tags
Modified: trunk/complement/explore/Makefiles/gmake/windows/sys.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/windows/sys.mak 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/gmake/windows/sys.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,11 +1,31 @@
-# Time-stamp: <05/09/09 21:12:38 ptr>
-# $Id$
+# Time-stamp: <07/05/31 00:10:23 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# 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
+#
RC := windres
+
+ifeq ($(OSREALNAME),cygwin)
+INSTALL := install
+
+INSTALL_SO := ${INSTALL} -m 0755
+INSTALL_A := ${INSTALL} -m 0644
+INSTALL_EXE := ${INSTALL} -m 0755
+else
INSTALL := copy
INSTALL_SO := ${INSTALL}
INSTALL_A := ${INSTALL}
INSTALL_EXE := ${INSTALL}
+endif
EXT_TEST := test
Modified: trunk/complement/explore/Makefiles/gmake/windows/targetsys.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/windows/targetsys.mak 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/gmake/windows/targetsys.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,4 +1,51 @@
-# Time-stamp: <05/09/09 21:03:45 ptr>
-# $Id$
+# Time-stamp: <07/05/31 00:07:23 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# 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
+#
-include $(SRCROOT)/Makefiles/gmake/cygming/targetsys.mak
+CC ?= gcc
+CXX ?= g++
+
+# shared library:
+SO := dll
+ifeq (gcc,$(COMPILER_NAME))
+LIB := dll.a
+else
+LIB := lib
+endif
+
+EXP := exp
+# executable:
+EXE := .exe
+
+# static library extention:
+ifeq (dmc,$(COMPILER_NAME))
+ARCH := lib
+AR := dm_lib -n
+AR_INS_R := -c
+AR_EXTR := -x
+AR_OUT = $(subst /,\,$@)
+else
+ifeq (bcc,$(COMPILER_NAME))
+ARCH := lib
+AR := tlib
+AR_INS_R := +
+AR_EXTR := *
+AR_OUT = $(subst /,\,$@)
+else
+ARCH := a
+AR := ar
+AR_INS_R := -rs
+AR_EXTR := -x
+AR_OUT = $@
+endif
+endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
