os2gcci.mk (7871dc3e) os2gcci.mk (534c536d)
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 161 unchanged lines hidden (view full) ---

170# this is needed to allow stl headers to include os2.h instead of svpm.h
171# in earlier stages of project build. Once svpm.h is in place, we can
172# compile without this flag.
173.IF "$(STL_OS2_BUILDING)" != ""
174CFLAGS+=-DSTL_OS2_BUILDING
175CFLAGSCXX+=-DSTL_OS2_BUILDING
176.ENDIF
177
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 161 unchanged lines hidden (view full) ---

170# this is needed to allow stl headers to include os2.h instead of svpm.h
171# in earlier stages of project build. Once svpm.h is in place, we can
172# compile without this flag.
173.IF "$(STL_OS2_BUILDING)" != ""
174CFLAGS+=-DSTL_OS2_BUILDING
175CFLAGSCXX+=-DSTL_OS2_BUILDING
176.ENDIF
177
178CFLAGS+=$(LIBXML_CFLAGS) -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/os2
179CFLAGSCXX+=$(LIBXML_CFLAGS) -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/os2
180
178# name of linker
179LINK*=gcc
180# default linker flags
181LINKFLAGS= -Zbin-files -Zmap
182#27/01/06 bin-files confuses transex/rsc work, removed.
183LINKFLAGS= -Zno-fork -Zhigh-mem -Zmap
184.IF "$(OS2_ARGS_WILD)" != ""
185LINKFLAGS+=-Zargs-wild -Zargs-resp
186.ENDIF
187
188.IF "$(aout)"==""
189#LINKFLAGS+= -Zlinker /NOI -Zlinker /PACKD:65536 -Zlinker /EXEPACK:2
190#LINKFLAGS+= -Zlinker /NOExtdictionary
191LINKFLAGS+= -Zomf
181# name of linker
182LINK*=gcc
183# default linker flags
184LINKFLAGS= -Zbin-files -Zmap
185#27/01/06 bin-files confuses transex/rsc work, removed.
186LINKFLAGS= -Zno-fork -Zhigh-mem -Zmap
187.IF "$(OS2_ARGS_WILD)" != ""
188LINKFLAGS+=-Zargs-wild -Zargs-resp
189.ENDIF
190
191.IF "$(aout)"==""
192#LINKFLAGS+= -Zlinker /NOI -Zlinker /PACKD:65536 -Zlinker /EXEPACK:2
193#LINKFLAGS+= -Zlinker /NOExtdictionary
194LINKFLAGS+= -Zomf
192#LINKFLAGS+= -Zlinker "DISABLE 1121"
195LINKFLAGS+= -Zlinker "DISABLE 1121"
193.ENDIF
194
195
196# linker flags for linking applications
197.IF "$(aout)"==""
198#LINKFLAGSAPPGUI= -Zlinker /PM:PM -Zstack 0x2000
199#LINKFLAGSAPPCUI= -Zlinker /PM:VIO
200.ELSE

--- 28 unchanged lines hidden (view full) ---

229LINKVERSIONMAPFLAG=-Wl,--version-script
230
231SONAME_SWITCH=-Wl,-h
232
233# Sequence of libs does matter !
234
235#STDLIBCPP=stdc++ supc++ gcc_eh
236#STDLIBCPP=stdc++ gcc432
196.ENDIF
197
198
199# linker flags for linking applications
200.IF "$(aout)"==""
201#LINKFLAGSAPPGUI= -Zlinker /PM:PM -Zstack 0x2000
202#LINKFLAGSAPPCUI= -Zlinker /PM:VIO
203.ELSE

--- 28 unchanged lines hidden (view full) ---

232LINKVERSIONMAPFLAG=-Wl,--version-script
233
234SONAME_SWITCH=-Wl,-h
235
236# Sequence of libs does matter !
237
238#STDLIBCPP=stdc++ supc++ gcc_eh
239#STDLIBCPP=stdc++ gcc432
237STDLIBCPP=stdc432 gcc432
240STDLIBCPP=-lstdc++ -lgcc_so_d
238
239# default objectfilenames to link
241
242# default objectfilenames to link
240STDOBJVCL=$(L)/salmain.obj
243STDOBJVCL=$(L)/salmain.o
241STDOBJGUI=
242STDSLOGUI=
243STDOBJCUI=
244STDSLOCUI=
245
246# libraries for linking applications
247STDLIBCUIST=$(STDLIBCPP)
248STDLIBGUIMT=$(STDLIBCPP)
249STDLIBCUIMT=$(STDLIBCPP)
250STDLIBGUIST=$(STDLIBCPP)
251# libraries for linking shared libraries
252STDSHLGUIMT=$(STDLIBCPP)
253STDSHLCUIMT=$(STDLIBCPP)
254
244STDOBJGUI=
245STDSLOGUI=
246STDOBJCUI=
247STDSLOCUI=
248
249# libraries for linking applications
250STDLIBCUIST=$(STDLIBCPP)
251STDLIBGUIMT=$(STDLIBCPP)
252STDLIBCUIMT=$(STDLIBCPP)
253STDLIBGUIST=$(STDLIBCPP)
254# libraries for linking shared libraries
255STDSHLGUIMT=$(STDLIBCPP)
256STDSHLCUIMT=$(STDLIBCPP)
257
255LIBSTLPORT=$(DYNAMIC) stlp45.lib
256LIBSTLPORTST=$(STATIC) stlp45.lib $(DYNAMIC)
258LIBSTLPORT=stlp45.lib $(DYNAMIC)
259LIBSTLPORTST=stlp45.lib $(STATIC) $(DYNAMIC)
257
258
259# name of library manager
260LIBMGR=ar
260
261
262# name of library manager
263LIBMGR=ar
261LIBFLAGS=crv
264LIBFLAGS=-crv
262
263.IF "$(aout)"==""
264LIBMGR=emxomfar -p2048
265.ENDIF
266
267# tool for generating import libraries
268IMPLIB=emximp
269IMPLIBFLAGS=-o

--- 15 unchanged lines hidden --- 		265
266.IF "$(aout)"==""
267LIBMGR=emxomfar -p2048
268.ENDIF
269
270# tool for generating import libraries
271IMPLIB=emximp
272IMPLIBFLAGS=-o

--- 15 unchanged lines hidden ---