Skip to content

C
core
Kaydet (Commit) 099d24da authored tarafından Patrick Luby's avatar Patrick Luby
Dosyalara gözat
Seçenekler

Updates to synchronize Mac OS X build with updates to init-static-template-data script

üst e51c0103
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 69 deletions
solenv/inc/_tg_app.mk
Dosyayı görüntüle @ 099d24da
...@@ -33,21 +33,17 @@ USE_APP1DEF= ...@@ -33,21 +33,17 @@ USE_APP1DEF=
# Link in static data members for template classes # Link in static data members for template classes
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
APP1STDLIBS+=$(STATICLIB) APP1STDLIBS+=$(STATICLIB)
.ENDIF .ENDIF
.ENDIF
.IF "$(APP1TARGETN)"!="" .IF "$(APP1TARGETN)"!=""
$(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
$(APP1RES) \ $(APP1RES) \
$(APP1ICON) $(APP1DEPN) $(USE_APP1DEF) $(APP1ICON) $(APP1DEPN) $(USE_APP1DEF)
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
@echo "------------------------------" @echo "------------------------------"
@echo "Updating static data member initializations" @echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
.ENDIF .ENDIF
@echo ------------------------------ @echo ------------------------------
@echo Making: $@ @echo Making: $@
...@@ -198,21 +194,17 @@ USE_APP2DEF= ...@@ -198,21 +194,17 @@ USE_APP2DEF=
# Link in static data members for template classes # Link in static data members for template classes
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
APP2STDLIBS+=$(STATICLIB) APP2STDLIBS+=$(STATICLIB)
.ENDIF .ENDIF
.ENDIF
.IF "$(APP2TARGETN)"!="" .IF "$(APP2TARGETN)"!=""
$(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
$(APP2RES) \ $(APP2RES) \
$(APP2ICON) $(APP2DEPN) $(USE_APP2DEF) $(APP2ICON) $(APP2DEPN) $(USE_APP2DEF)
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
@echo "------------------------------" @echo "------------------------------"
@echo "Updating static data member initializations" @echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
.ENDIF .ENDIF
@echo ------------------------------ @echo ------------------------------
@echo Making: $@ @echo Making: $@
...@@ -363,21 +355,17 @@ USE_APP3DEF= ...@@ -363,21 +355,17 @@ USE_APP3DEF=
# Link in static data members for template classes # Link in static data members for template classes
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
APP3STDLIBS+=$(STATICLIB) APP3STDLIBS+=$(STATICLIB)
.ENDIF .ENDIF
.ENDIF
.IF "$(APP3TARGETN)"!="" .IF "$(APP3TARGETN)"!=""
$(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
$(APP3RES) \ $(APP3RES) \
$(APP3ICON) $(APP3DEPN) $(USE_APP3DEF) $(APP3ICON) $(APP3DEPN) $(USE_APP3DEF)
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
@echo "------------------------------" @echo "------------------------------"
@echo "Updating static data member initializations" @echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
.ENDIF .ENDIF
@echo ------------------------------ @echo ------------------------------
@echo Making: $@ @echo Making: $@
...@@ -528,21 +516,17 @@ USE_APP4DEF= ...@@ -528,21 +516,17 @@ USE_APP4DEF=
# Link in static data members for template classes # Link in static data members for template classes
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
APP4STDLIBS+=$(STATICLIB) APP4STDLIBS+=$(STATICLIB)
.ENDIF .ENDIF
.ENDIF
.IF "$(APP4TARGETN)"!="" .IF "$(APP4TARGETN)"!=""
$(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
$(APP4RES) \ $(APP4RES) \
$(APP4ICON) $(APP4DEPN) $(USE_APP4DEF) $(APP4ICON) $(APP4DEPN) $(USE_APP4DEF)
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
@echo "------------------------------" @echo "------------------------------"
@echo "Updating static data member initializations" @echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
.ENDIF .ENDIF
@echo ------------------------------ @echo ------------------------------
@echo Making: $@ @echo Making: $@
...@@ -693,21 +677,17 @@ USE_APP5DEF= ...@@ -693,21 +677,17 @@ USE_APP5DEF=
# Link in static data members for template classes # Link in static data members for template classes
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
APP5STDLIBS+=$(STATICLIB) APP5STDLIBS+=$(STATICLIB)
.ENDIF .ENDIF
.ENDIF
.IF "$(APP5TARGETN)"!="" .IF "$(APP5TARGETN)"!=""
$(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
$(APP5RES) \ $(APP5RES) \
$(APP5ICON) $(APP5DEPN) $(USE_APP5DEF) $(APP5ICON) $(APP5DEPN) $(USE_APP5DEF)
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
@echo "------------------------------" @echo "------------------------------"
@echo "Updating static data member initializations" @echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
.ENDIF .ENDIF
@echo ------------------------------ @echo ------------------------------
@echo Making: $@ @echo Making: $@
...@@ -858,21 +838,17 @@ USE_APP6DEF= ...@@ -858,21 +838,17 @@ USE_APP6DEF=
# Link in static data members for template classes # Link in static data members for template classes
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
APP6STDLIBS+=$(STATICLIB) APP6STDLIBS+=$(STATICLIB)
.ENDIF .ENDIF
.ENDIF
.IF "$(APP6TARGETN)"!="" .IF "$(APP6TARGETN)"!=""
$(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
$(APP6RES) \ $(APP6RES) \
$(APP6ICON) $(APP6DEPN) $(USE_APP6DEF) $(APP6ICON) $(APP6DEPN) $(USE_APP6DEF)
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
@echo "------------------------------" @echo "------------------------------"
@echo "Updating static data member initializations" @echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
.ENDIF .ENDIF
@echo ------------------------------ @echo ------------------------------
@echo Making: $@ @echo Making: $@
...@@ -1023,21 +999,17 @@ USE_APP7DEF= ...@@ -1023,21 +999,17 @@ USE_APP7DEF=
# Link in static data members for template classes # Link in static data members for template classes
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
APP7STDLIBS+=$(STATICLIB) APP7STDLIBS+=$(STATICLIB)
.ENDIF .ENDIF
.ENDIF
.IF "$(APP7TARGETN)"!="" .IF "$(APP7TARGETN)"!=""
$(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
$(APP7RES) \ $(APP7RES) \
$(APP7ICON) $(APP7DEPN) $(USE_APP7DEF) $(APP7ICON) $(APP7DEPN) $(USE_APP7DEF)
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
@echo "------------------------------" @echo "------------------------------"
@echo "Updating static data member initializations" @echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
.ENDIF .ENDIF
@echo ------------------------------ @echo ------------------------------
@echo Making: $@ @echo Making: $@
...@@ -1188,21 +1160,17 @@ USE_APP8DEF= ...@@ -1188,21 +1160,17 @@ USE_APP8DEF=
# Link in static data members for template classes # Link in static data members for template classes
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
APP8STDLIBS+=$(STATICLIB) APP8STDLIBS+=$(STATICLIB)
.ENDIF .ENDIF
.ENDIF
.IF "$(APP8TARGETN)"!="" .IF "$(APP8TARGETN)"!=""
$(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
$(APP8RES) \ $(APP8RES) \
$(APP8ICON) $(APP8DEPN) $(USE_APP8DEF) $(APP8ICON) $(APP8DEPN) $(USE_APP8DEF)
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
@echo "------------------------------" @echo "------------------------------"
@echo "Updating static data member initializations" @echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
.ENDIF .ENDIF
@echo ------------------------------ @echo ------------------------------
@echo Making: $@ @echo Making: $@
...@@ -1353,21 +1321,17 @@ USE_APP9DEF= ...@@ -1353,21 +1321,17 @@ USE_APP9DEF=
# Link in static data members for template classes # Link in static data members for template classes
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
APP9STDLIBS+=$(STATICLIB) APP9STDLIBS+=$(STATICLIB)
.ENDIF .ENDIF
.ENDIF
.IF "$(APP9TARGETN)"!="" .IF "$(APP9TARGETN)"!=""
$(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
$(APP9RES) \ $(APP9RES) \
$(APP9ICON) $(APP9DEPN) $(USE_APP9DEF) $(APP9ICON) $(APP9DEPN) $(USE_APP9DEF)
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
@echo "------------------------------" @echo "------------------------------"
@echo "Updating static data member initializations" @echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
.ENDIF .ENDIF
@echo ------------------------------ @echo ------------------------------
@echo Making: $@ @echo Making: $@
...@@ -1518,21 +1482,17 @@ USE_APP10DEF= ...@@ -1518,21 +1482,17 @@ USE_APP10DEF=
# Link in static data members for template classes # Link in static data members for template classes
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
APP10STDLIBS+=$(STATICLIB) APP10STDLIBS+=$(STATICLIB)
.ENDIF .ENDIF
.ENDIF
.IF "$(APP10TARGETN)"!="" .IF "$(APP10TARGETN)"!=""
$(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
$(APP10RES) \ $(APP10RES) \
$(APP10ICON) $(APP10DEPN) $(USE_APP10DEF) $(APP10ICON) $(APP10DEPN) $(USE_APP10DEF)
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
@echo "------------------------------" @echo "------------------------------"
@echo "Updating static data member initializations" @echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
.ENDIF .ENDIF
@echo ------------------------------ @echo ------------------------------
@echo Making: $@ @echo Making: $@
......
solenv/inc/_tg_shl.mk
Dosyayı görüntüle @ 099d24da
This diff is collapsed.
solenv/inc/tg_app.mk
Dosyayı görüntüle @ 099d24da
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
#* $Workfile: tg_app.mk $ #* $Workfile: tg_app.mk $
#* #*
#* Ersterstellung XX TT.MM.JJ #* Ersterstellung XX TT.MM.JJ
#* Letzte Aenderung $Author: pluby $ $Date: 2001-02-26 07:51:45 $ #* Letzte Aenderung $Author: pluby $ $Date: 2001-02-26 21:51:20 $
#* $Revision: 1.12 $ #* $Revision: 1.13 $
#* #*
#* $Logfile: T:/solar/inc/tg_app.mkv $ #* $Logfile: T:/solar/inc/tg_app.mkv $
#* #*
...@@ -79,21 +79,17 @@ USE_APP$(TNR)DEF= ...@@ -79,21 +79,17 @@ USE_APP$(TNR)DEF=
# Link in static data members for template classes # Link in static data members for template classes
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
APP$(TNR)STDLIBS+=$(STATICLIB) APP$(TNR)STDLIBS+=$(STATICLIB)
.ENDIF .ENDIF
.ENDIF
.IF "$(APP$(TNR)TARGETN)"!="" .IF "$(APP$(TNR)TARGETN)"!=""
$(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
$(APP$(TNR)RES) \ $(APP$(TNR)RES) \
$(APP$(TNR)ICON) $(APP$(TNR)DEPN) $(USE_APP$(TNR)DEF) $(APP$(TNR)ICON) $(APP$(TNR)DEPN) $(USE_APP$(TNR)DEF)
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
@echo "------------------------------" @echo "------------------------------"
@echo "Updating static data member initializations" @echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
.ENDIF .ENDIF
@echo ------------------------------ @echo ------------------------------
@echo Making: $@ @echo Making: $@
......
solenv/inc/tg_shl.mk
Dosyayı görüntüle @ 099d24da
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
# #
# $RCSfile: tg_shl.mk,v $ # $RCSfile: tg_shl.mk,v $
# #
# $Revision: 1.21 $ # $Revision: 1.22 $
# #
# last change: $Author: pluby $ $Date: 2001-02-26 07:51:45 $ # last change: $Author: pluby $ $Date: 2001-02-26 21:51:20 $
# #
# The Contents of this file are made available subject to the terms of # The Contents of this file are made available subject to the terms of
# either of the following licenses # either of the following licenses
...@@ -106,10 +106,8 @@ SHL$(TNR)STDLIBS= ...@@ -106,10 +106,8 @@ SHL$(TNR)STDLIBS=
# Link in static data members for template classes # Link in static data members for template classes
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
.IF "$(TARGET)"!="$(STATICLIBNAME)"
SHL$(TNR)STDLIBS+=$(STATICLIB) SHL$(TNR)STDLIBS+=$(STATICLIB)
.ENDIF .ENDIF
.ENDIF
.IF "$(SHLLINKARCONLY)" != "" .IF "$(SHLLINKARCONLY)" != ""
SHL$(TNR)STDLIBS= SHL$(TNR)STDLIBS=
...@@ -422,11 +420,9 @@ $(SHL$(TNR)TARGETN) : \ ...@@ -422,11 +420,9 @@ $(SHL$(TNR)TARGETN) : \
.ENDIF .ENDIF
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.IF "$(TARGET)"!="$(STATICLIBNAME)" @echo "------------------------------"
@echo "------------------------------" @echo "Updating static data member initializations"
@echo "Updating static data member initializations" @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)"
.ENDIF
.ENDIF .ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
......
solenv/inc/unxmacxp.mk
Dosyayı görüntüle @ 099d24da
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
# #
# $RCSfile: unxmacxp.mk,v $ # $RCSfile: unxmacxp.mk,v $
# #
# $Revision: 1.23 $ # $Revision: 1.24 $
# #
# last change: $Author: pluby $ $Date: 2001-02-25 19:51:13 $ # last change: $Author: pluby $ $Date: 2001-02-26 21:51:20 $
# #
# The Contents of this file are made available subject to the terms of # The Contents of this file are made available subject to the terms of
# either of the following licenses # either of the following licenses
...@@ -131,7 +131,7 @@ SOLARVERSHLLIBS+=$(shell -ls $(STLPORT4)$/lib$/*$(DLLPOST)) ...@@ -131,7 +131,7 @@ SOLARVERSHLLIBS+=$(shell -ls $(STLPORT4)$/lib$/*$(DLLPOST))
LINK=cc LINK=cc
LINKFLAGS=-dynamic -framework System -framework Cocoa -lcc_dynamic -lstdc++ \ LINKFLAGS=-dynamic -framework System -framework Cocoa -lcc_dynamic -lstdc++ \
$(foreach,i,$(SOLARVERSHLLIBS) '-dylib_file @executable_path$/$(i:f):$i') $(foreach,i,$(SOLARVERSHLLIBS) -dylib_file @executable_path$/$(i:f):$i)
LINKFLAGSAPPGUI=-Wl,-u,__objcInit LINKFLAGSAPPGUI=-Wl,-u,__objcInit
LINKFLAGSSHLGUI=-dynamiclib -install_name '@executable_path$/$(@:f)' \ LINKFLAGSSHLGUI=-dynamiclib -install_name '@executable_path$/$(@:f)' \
-Wl,-U,___progname -Wl,-U,_environ -Wl,-U,___progname -Wl,-U,_environ
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment