diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-02 08:23:33 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-02 08:23:33 +0000 |
| commit | 430934552938a4ca85f7941a65b338cadc2856e6 (patch) | |
| tree | c3007f3d5b40c9e78d149530a75bc46be4975c12 /solenv/inc/tg_app.mk | |
| parent | cd831e0a9b605eb3a82944de5f4819ae8d5bdc2b (diff) | |
#i10000# Undo last changes to make it consistent with enrolled _tg_app.mk
Diffstat (limited to 'solenv/inc/tg_app.mk')
| -rw-r--r-- | solenv/inc/tg_app.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk index 6e291314049b..dede0e11dd00 100644 --- a/solenv/inc/tg_app.mk +++ b/solenv/inc/tg_app.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_app.mk,v $ # -# $Revision: 1.66 $ +# $Revision: 1.67 $ # -# last change: $Author: hr $ $Date: 2007-06-27 22:05:09 $ +# last change: $Author: rt $ $Date: 2007-07-02 09:23:33 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -156,18 +156,18 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \ $(RC) -DWIN32 $(APP$(TNR)PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP$(TNR)LINKRES:b).rc .ENDIF # "$(APP$(TNR)LINKRES)" != "" .IF "$(COM)" == "GCC" - @+echo mingw + @echo mingw .IF "$(APP$(TNR)LINKRES)" != "" || "$(APP$(TNR)RES)" != "" - @cat $(APP$(TNR)LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP$(TNR)RES)) > $(MISC)$/$(@:b)_all.RES - windres $(MISC)$/$(@:b)_all.RES $(APP$(TNR)RESO) + @cat $(APP$(TNR)LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP$(TNR)RES)) > $(MISC)$/$(@:b)_all.res + windres $(MISC)$/$(@:b)_all.res $(APP$(TNR)RESO) .ENDIF - @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ $(APP$(TNR)BASEX) $(APP$(TNR)STACKN) -o $@ $(APP$(TNR)OBJS) \ -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP$(TNR)RESO) \ `$(TYPE) /dev/null $(APP$(TNR)LIBS) | sed s#$(ROUT)#$(OUT)#g` \ - $(APP_LINKTYPE) $(APP$(TNR)LIBSALCPPRT) $(APP$(TNR)STDLIBS) $(APP$(TNR)STDLIB) $(STDLIB$(TNR)) > $(MISC)$/$(@:b).cmd - @+$(TYPE) $(MISC)$/$(@:b).cmd - @+source $(MISC)$/$(@:b).cmd + $(APP_LINKTYPE) $(APP$(TNR)LIBSALCPPRT) $(APP$(TNR)STDLIBS) $(APP$(TNR)STDLIB) $(STDLIB$(TNR)) > $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd + @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd + @+source $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd @ls -l $@ .ELSE # "$(COM)" == "GCC" .IF "$(linkinc)" == "" |