Index: solenv/inc/unxirgm.mk =================================================================== RCS file: /cvs/oo/tools/solenv/inc/unxirgm.mk,v retrieving revision 1.4 diff -u -r1.4 unxirgm.mk --- solenv/inc/unxirgm.mk 2002/01/02 10:14:54 1.4 +++ solenv/inc/unxirgm.mk 2002/04/02 23:42:43 @@ -16,8 +16,7 @@ #CC= CC -KPIC -c -n32 -ptused -OPT:Olimit=20523 CC= g++ -c CFLAGS= $(INCLUDE) -CDEFS+= -DVCL -D_PTHREADS -CDEFS+= -D_STD_NO_NAMESPACE -D_UNO_NO_NAMESPACE -DHAVE_UNISTD_H -DSTLPORT_VERSION=0x450 +CDEFS+= -DVCL -D_PTHREADS -DSTLPORT_VERSION=0x450 -DFORCE_SYSALLOC -D_USE_NAMESPACE=1 -DHAVE_UNISTD_H #CDEFS+= -D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE -DHAVE_UNISTD_H -DSTLPORT_VERSION=0x450 # CFLAGS+= -D__STL_NATIVE_INCLUDE_PATH=/usr/include -D__STL_NATIVE_C_INCLUDE_PATH=/usr/include # CFLAGS+= -D_STL_NATIVE_INCLUDE_PATH=/usr/include -D_STL_NATIVE_C_INCLUDE_PATH=/usr/include @@ -31,9 +30,9 @@ CFLAGSSLOCUIMT= -fpic CFLAGSPROF= CFLAGSDEBUG= -g -CFLAGSDBGUTIL= +CFLAGSDBGUTIL= CFLAGSOPT= -O2 -CFLAGSNOOPT= -O +CFLAGSNOOPT= -O0 CFLAGSOUTOBJ= -o STATIC= -Wl,-Bstatic @@ -67,7 +67,7 @@ #LINKFLAGSSHLGUI += -Wl,-Bsymbolic -Wl,-soname -Wl,$(DLLPRE)$(SHL$(TNR)TARGET)$(DLLPOST) $(DYNAMIC) #LINKFLAGSSHLCUI += -Wl,-Bsymbolic -Wl,-soname -Wl,$(DLLPRE)$(SHL$(TNR)TARGET)$(DLLPOST) $(DYNAMIC) - +SONAME_SWITCH = -Wl,-soname -Wl, APPLINKSTATIC=-Bstatic APPLINKSHARED=-Bsymbolic