diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-03-09 08:32:40 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-03-09 08:32:40 +0000 |
| commit | 83a2e8895f3e4ad02d5593401e98daced3be8974 (patch) | |
| tree | b70bf3c1a35abdcfcabffea232b9f2d04e39882d /rsc/source/prj | |
| parent | 8a5c68c5e2a161c59454728a97ebd3e02b8ae52e (diff) | |
INTEGRATION: CWS ause076 (1.5.4); FILE MERGED
2007/02/28 10:56:15 hjs 1.5.4.1: #i74812# cleanup *LIB and more
Diffstat (limited to 'rsc/source/prj')
| -rw-r--r-- | rsc/source/prj/makefile.mk | 65 |
1 files changed, 8 insertions, 57 deletions
diff --git a/rsc/source/prj/makefile.mk b/rsc/source/prj/makefile.mk index e3ba01669a41..29d4322d9fe8 100644 --- a/rsc/source/prj/makefile.mk +++ b/rsc/source/prj/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: vg $ $Date: 2007-02-06 14:31:59 $ +# last change: $Author: obo $ $Date: 2007-03-09 09:32:40 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -46,35 +46,19 @@ LIBTARGET=NO # --- Files -------------------------------------------------------------- -.IF "$(GUI)"!="WIN" -CXXFILES= gui.cxx \ - start.cxx - OBJFILES= $(OBJ)$/gui.obj \ $(OBJ)$/start.obj -.IF "$(GUI)$(COM)$(COMEX)" != "DOSSTCX" APP1TARGET= rsc APP1STDLIBS=$(TOOLSLIB) $(I18NISOLANGLIB) $(VOSLIB) $(SALLIB) # $(RTLLIB) APP1LIBS= $(LB)$/rsctoo.lib APP1OBJS= $(OBJ)$/start.obj + +# why not this way? APP1STACK=64000 -.IF "$(GUI)" != "OS2" -APP1STACK=32768 -.ENDIF -.ENDIF +#APP1STACK=32768 -.IF "$(GUI)$(COM)$(COMEX)" != "DOSSTC" APP2TARGET= rsc2 -.IF "$(GUI)" == "MAC" -APP2STDLIBS=$(PRJ)$/..$/TOOLS$/$(INPATH)$/SLB$/tools.lib \ - $(PRJ)$/..$/SAL$/$(INPATH)$/SLB$/cpposl.lib \ - $(PRJ)$/..$/VOS$/$(INPATH)$/SLB$/cppvos.lib \ - $(PRJ)$/..$/RTL$/$(INPATH)$/SLB$/cpprtl.lib \ - $(MWPPCLibraries)PPCToolLibs.o \ - $(STDSLOGUI) -MACRES= $(SV_RES)MPWToolCfrg.r -d SVTOOLNAME="¶"SV TOOL¶"" -.ELSE .IF "$(OS)"=="SCO" # SCO hat Probleme mit fork/exec und einigen shared libraries. # rsc2 muss daher statisch gelinkt werden @@ -82,51 +66,18 @@ APP2STDLIBS=$(STATIC) -latools $(BPICONVLIB) $(VOSLIB) $(OSLLIB) $(RTLLIB) $(DYN .ELSE APP2STDLIBS=$(TOOLSLIB) $(I18NISOLANGLIB) $(VOSLIB) $(SALLIB) #RTLLIB) .ENDIF -.ENDIF APP2LIBS= $(LB)$/rsctoo.lib \ $(LB)$/rscres.lib \ $(LB)$/rscpar.lib \ $(LB)$/rscrsc.lib \ $(LB)$/rscmis.lib APP2OBJS= $(OBJ)$/gui.obj + +# why not this way? APP2STACK=64000 -.IF "$(GUI)" != "OS2" -APP2STACK=32768 -.ENDIF -.ENDIF -.ENDIF +#APP2STACK=32768 # --- Targets ------------------------------------------------------------ .INCLUDE : target.mk -# ------------------------------------------------------------------- -# PM2 -# ------------------------------------------------------------------- - -.IF "$(GUI)" == "OS2" - -$(MISC)$/$(APP1TARGET).def : makefile - echo NAME RSC WINDOWCOMPAT >$@ - echo DESCRIPTION 'RSC-Compiler' >>$@ -.IF "$(COM)" != "BLC" - echo STUB 'os2STUB.EXE' >>$@ -.ENDIF - echo DATA MULTIPLE >>$@ - echo EXETYPE OS2 >>$@ - echo PROTMODE >>$@ - echo HEAPSIZE 16000 >>$@ - echo STACKSIZE 48000 >>$@ - -$(MISC)$/$(APP2TARGET).def : makefile - echo NAME RSC2 WINDOWCOMPAT >$@ - echo DESCRIPTION 'RSC2-Compiler' >>$@ -.IF "$(COM)" != "BLC" - echo STUB 'os2STUB.EXE' >>$@ -.ENDIF - echo DATA MULTIPLE >>$@ - echo EXETYPE OS2 >>$@ - echo PROTMODE >>$@ - echo HEAPSIZE 16000 >>$@ - echo STACKSIZE 48000 >>$@ -.ENDIF |