diff options
author | Oliver Bolte <obo@openoffice.org> | 2008-07-22 15:50:51 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2008-07-22 15:50:51 +0000 |
commit | 6af0deee9acff537023a7500a72875bc880375fb (patch) | |
tree | b1f515720f5e70d2a7d4daeb0c8e2291f13c8459 /solenv/inc/tg_app.mk | |
parent | 2d5aef0dd64ec589058fb9aea8d9eb7bbfd65614 (diff) |
INTEGRATION: CWS os2port03 (1.68.10); FILE MERGED
2008/07/16 12:19:56 obr 1.68.10.3: RESYNC: (1.69-1.74); FILE MERGED
2008/01/15 13:52:15 obr 1.68.10.2: RESYNC: (1.68-1.69); FILE MERGED
2008/01/15 09:36:36 ydario 1.68.10.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
Diffstat (limited to 'solenv/inc/tg_app.mk')
-rw-r--r-- | solenv/inc/tg_app.mk | 82 |
1 files changed, 80 insertions, 2 deletions
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk index 265dc8fa2572..d6846a0410d8 100644 --- a/solenv/inc/tg_app.mk +++ b/solenv/inc/tg_app.mk @@ -8,7 +8,7 @@ # # $RCSfile: tg_app.mk,v $ # -# $Revision: 1.74 $ +# $Revision: 1.75 $ # # This file is part of OpenOffice.org. # @@ -33,6 +33,10 @@ # instructions for linking # unroll begin +.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" +APP$(TNR)DEF = $(MISC)$/$(APP$(TNR)TARGET).def +.ENDIF + .IF "$(APP$(TNR)LINKTYPE)" != "" #must be either STATIC or SHARED APP$(TNR)LINKTYPEFLAG=$(APPLINK$(APP$(TNR)LINKTYPE)) @@ -88,7 +92,7 @@ APP$(TNR)PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP$(TNR)PRODUCTNAME)\" .ENDIF # "$(APP$(TNR)PRODUCTNAME)"!="" .IF "$(linkinc)"!="" -.IF "$(GUI)"=="WNT" +.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(APP$(TNR)LIBS)"!="" $(MISC)$/$(APP$(TNR)TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ @@ -103,8 +107,16 @@ $(APP$(TNR)TARGETN) : $(LINKINCTARGETS) # Allow for target specific LIBSALCPPRT override APP$(TNR)LIBSALCPPRT*=$(LIBSALCPPRT) +.IF "$(GUI)" == "OS2" +_APP$(TNR)IMP_ORD = $(APP$(TNR)STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(APP$(TNR)STDLIBS:^"$(LB)$/") +APP$(TNR)IMP_ORD = $(foreach,i,$(_APP$(TNR)IMP_ORD) $(shell @-ls $i)) +.ELSE +APP$(TNR)IMP_ORD = +.ENDIF + $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \ $(APP$(TNR)RES) \ + $(APP$(TNR)IMP_ORD) \ $(APP$(TNR)ICON) $(APP$(TNR)DEPN) $(USE_APP$(TNR)DEF) @echo ------------------------------ @echo Making: $@ @@ -233,6 +245,72 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \ .ENDIF # "$(GUI)" == "WNT" +.IF "$(GUI)" == "OS2" + @+-$(MKDIR) $(@:d:d) >& $(NULLDEV) +.IF "$(APP$(TNR)LINKRES)" != "" + @+-$(RM) $(MISC)$/$(APP$(TNR)LINKRES:b).rc >& $(NULLDEV) +.IF "$(APP$(TNR)ICON)" != "" +.IF "$(USE_SHELL)"=="4nt" + @-+echo ICON 1 "$(APP$(TNR)ICON:s/\/\\/)" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc +.ELSE # "$(USE_SHELL)"=="4nt" + @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP$(TNR)ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc +.ENDIF # "$(USE_SHELL)"=="4nt" +.ENDIF # "$(APP$(TNR)ICON)" != "" +.IF "$(APP$(TNR)VERINFO)" != "" + @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc + @-+echo $(EMQ)#include $(EMQ)"$(APP$(TNR)VERINFO)$(EMQ)" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc +.ENDIF # "$(APP$(TNR)VERINFO)" != "" + $(RC) -r -DOS2 $(APP$(TNR)PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP$(TNR)LINKRES:b).rc +.ENDIF # "$(APP$(TNR)LINKRES)" != "" + +.IF "$(TARGETTYPE)" == "GUI" + @echo NAME $(APP$(TNR)TARGET) WINDOWAPI > $(MISC)$/$(APP$(TNR)TARGET).def +.ENDIF + + @+echo $(APP$(TNR)LINKFLAGS) \ + $(LINKFLAGSAPP) $(APP$(TNR)BASEX) \ + $(APP$(TNR)STACKN) \ + -o $@ \ + -Zmap -L$(LB) \ + -L$(SOLARVERSION)$/$(INPATH)$/lib \ + $(STDOBJ) \ + $(APP$(TNR)LINKRES) \ + $(APP$(TNR)RES) \ + $(APP$(TNR)DEF) \ + $(APP$(TNR)OBJS) \ + $(APP$(TNR)LIBS) \ + $(APP$(TNR)STDLIBS:^"-l") \ + $(APP$(TNR)STDLIB:^"-l") $(STDLIB$(TNR):^"-l") + $(APP$(TNR)LINKER) -v \ + $(APP$(TNR)LINKFLAGS) \ + $(LINKFLAGSAPP) $(APP$(TNR)BASEX) \ + $(APP$(TNR)STACKN) \ + -o $@ \ + -Zmap -L$(LB) \ + -L$(SOLARVERSION)$/$(INPATH)$/lib \ + $(STDOBJ) \ + $(APP$(TNR)LINKRES) \ + $(APP$(TNR)RES) \ + $(APP$(TNR)DEF) \ + $(APP$(TNR)OBJS) \ + $(APP$(TNR)LIBS) \ + $(APP$(TNR)STDLIBS:^"-l") \ + $(APP$(TNR)STDLIB:^"-l") $(STDLIB$(TNR):^"-l") + + +.IF "$(APP$(TNR)TARGET)" == "loader" + +$(PERL) loader.pl $@ +.IF "$(USE_SHELL)"=="4nt" + +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe +.ELSE # "$(USE_SHELL)"=="4nt" + +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe +.ENDIF # "$(USE_SHELL)"=="4nt" + +$(RM) $@ + +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe +.ENDIF # "$(TARGET)" == "setup" + +.ENDIF # "$(GUI)" == "OS2" + .ENDIF # "$(APP$(TNR)TARGETN)"!="" |