View | Details | Raw Unified | Return to issue 3822
Collapse All | Expand All

(-)solenv/inc/unxirgm.mk (-5 / +4 lines)
Lines 16-23 Link Here
16
#CC=			CC -KPIC -c -n32 -ptused -OPT:Olimit=20523 
16
#CC=			CC -KPIC -c -n32 -ptused -OPT:Olimit=20523 
17
CC=			g++ -c
17
CC=			g++ -c
18
CFLAGS=		$(INCLUDE)
18
CFLAGS=		$(INCLUDE)
19
CDEFS+=	-DVCL -D_PTHREADS
19
CDEFS+=	-DVCL -D_PTHREADS -DSTLPORT_VERSION=0x450  -DFORCE_SYSALLOC -D_USE_NAMESPACE=1 -DHAVE_UNISTD_H
20
CDEFS+=	-D_STD_NO_NAMESPACE -D_UNO_NO_NAMESPACE -DHAVE_UNISTD_H -DSTLPORT_VERSION=0x450
21
#CDEFS+=	-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE -DHAVE_UNISTD_H -DSTLPORT_VERSION=0x450
20
#CDEFS+=	-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE -DHAVE_UNISTD_H -DSTLPORT_VERSION=0x450
22
# CFLAGS+=	-D__STL_NATIVE_INCLUDE_PATH=/usr/include -D__STL_NATIVE_C_INCLUDE_PATH=/usr/include
21
# CFLAGS+=	-D__STL_NATIVE_INCLUDE_PATH=/usr/include -D__STL_NATIVE_C_INCLUDE_PATH=/usr/include
23
# CFLAGS+=	-D_STL_NATIVE_INCLUDE_PATH=/usr/include -D_STL_NATIVE_C_INCLUDE_PATH=/usr/include
22
# CFLAGS+=	-D_STL_NATIVE_INCLUDE_PATH=/usr/include -D_STL_NATIVE_C_INCLUDE_PATH=/usr/include
Lines 31-39 Link Here
31
CFLAGSSLOCUIMT= -fpic
30
CFLAGSSLOCUIMT= -fpic
32
CFLAGSPROF=
31
CFLAGSPROF=
33
CFLAGSDEBUG=	-g
32
CFLAGSDEBUG=	-g
34
CFLAGSDBGUTIL=
33
CFLAGSDBGUTIL= 
35
CFLAGSOPT=		-O2
34
CFLAGSOPT=		-O2
36
CFLAGSNOOPT=		-O
35
CFLAGSNOOPT=		-O0
37
CFLAGSOUTOBJ=	-o
36
CFLAGSOUTOBJ=	-o
38
37
39
STATIC=			-Wl,-Bstatic
38
STATIC=			-Wl,-Bstatic
Lines 67-73 Link Here
67
67
68
#LINKFLAGSSHLGUI += -Wl,-Bsymbolic -Wl,-soname -Wl,$(DLLPRE)$(SHL$(TNR)TARGET)$(DLLPOST) $(DYNAMIC)
68
#LINKFLAGSSHLGUI += -Wl,-Bsymbolic -Wl,-soname -Wl,$(DLLPRE)$(SHL$(TNR)TARGET)$(DLLPOST) $(DYNAMIC)
69
#LINKFLAGSSHLCUI += -Wl,-Bsymbolic -Wl,-soname -Wl,$(DLLPRE)$(SHL$(TNR)TARGET)$(DLLPOST) $(DYNAMIC)
69
#LINKFLAGSSHLCUI += -Wl,-Bsymbolic -Wl,-soname -Wl,$(DLLPRE)$(SHL$(TNR)TARGET)$(DLLPOST) $(DYNAMIC)
70
70
SONAME_SWITCH = -Wl,-soname -Wl,
71
APPLINKSTATIC=-Bstatic
71
APPLINKSTATIC=-Bstatic
72
APPLINKSHARED=-Bsymbolic
72
APPLINKSHARED=-Bsymbolic
73
73

Return to issue 3822