settings.mk (b3ba5bc7) settings.mk (75b2d2d7)
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

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

88URLPREFIX=file:///
89
90SALLIB=isal.lib
91CPPULIB=icppu.lib
92CPPUHELPERLIB=icppuhelper.lib
93SALHELPERLIB=isalhelper.lib
94REGLIB=ireg.lib
95STORELIB=istore.lib
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

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

88URLPREFIX=file:///
89
90SALLIB=isal.lib
91CPPULIB=icppu.lib
92CPPUHELPERLIB=icppuhelper.lib
93SALHELPERLIB=isalhelper.lib
94REGLIB=ireg.lib
95STORELIB=istore.lib
96STLPORTLIB=stlport_vc71$(STLDEBUG).lib
97
98BLANK=
99EMPTYSTRING=
100PATH_SEPARATOR=;
101
102# use this for release version
103CC_FLAGS_JNI=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa
104CC_FLAGS=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa

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

122# -DCPPU_ENV=msci -- windows msvc 4.x - 7.x
123
124CC_DEFINES_JNI=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci
125CC_DEFINES=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci
126CC_OUTPUT_SWITCH=-Fo
127
128LIBRARY_LINK_FLAGS=/NODEFAULTLIB /DLL /DEBUGTYPE:cv
129COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) /DEF:$(PRJ)/settings/component.uno.def
96
97BLANK=
98EMPTYSTRING=
99PATH_SEPARATOR=;
100
101# use this for release version
102CC_FLAGS_JNI=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa
103CC_FLAGS=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa

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

121# -DCPPU_ENV=msci -- windows msvc 4.x - 7.x
122
123CC_DEFINES_JNI=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci
124CC_DEFINES=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci
125CC_OUTPUT_SWITCH=-Fo
126
127LIBRARY_LINK_FLAGS=/NODEFAULTLIB /DLL /DEBUGTYPE:cv
128COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) /DEF:$(PRJ)/settings/component.uno.def
130EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x1b000000 /DEBUGTYPE:cv /NODEFAULTLIB msvcrt.lib kernel32.lib
129EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x1b000000 /DEBUGTYPE:cv /NODEFAULTLIB msvcrt.lib msvcprt.lib kernel32.lib
131ifeq "$(DEBUG)" "yes"
132LIBRARY_LINK_FLAGS+=/DEBUG
133EXE_LINK_FLAGS+=/DEBUG
134endif
135
136LINK_JAVA_LIBS=/LIBPATH:"$(OO_SDK_JAVA_HOME)/lib"
137
138#ifneq "$(OFFICE_PROGRAM_PATH)" ""

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

206include $(PRJ)/include/udkversion.mk
207
208SALLIB=-luno_sal
209CPPULIB=-luno_cppu
210CPPUHELPERLIB=-luno_cppuhelperC52
211SALHELPERLIB=-luno_salhelperC52
212REGLIB=-lreg
213STORELIB=-lstore
130ifeq "$(DEBUG)" "yes"
131LIBRARY_LINK_FLAGS+=/DEBUG
132EXE_LINK_FLAGS+=/DEBUG
133endif
134
135LINK_JAVA_LIBS=/LIBPATH:"$(OO_SDK_JAVA_HOME)/lib"
136
137#ifneq "$(OFFICE_PROGRAM_PATH)" ""

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

205include $(PRJ)/include/udkversion.mk
206
207SALLIB=-luno_sal
208CPPULIB=-luno_cppu
209CPPUHELPERLIB=-luno_cppuhelperC52
210SALHELPERLIB=-luno_salhelperC52
211REGLIB=-lreg
212STORELIB=-lstore
214ifeq "$(PROCTYPE)" "sparc64"
215STLPORTLIB=-library=stlport4
216else
217STLPORTLIB=-lstlport_sunpro$(STLDEBUG)
218endif
219
220EMPTYSTRING=
221PATH_SEPARATOR=:
222
223CC_FLAGS_JNI=-c -KPIC
224CC_FLAGS=-c -KPIC -xldscope=hidden
225ifeq "$(DEBUG)" "yes"
226CC_FLAGS_JNI+=-g

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

272# Settings for Linux using gcc compiler
273
274PROCTYPE := $(shell $(PRJ)/config.guess | cut -d "-" -f1 | sed -e 's/^i.86$$/i386/')
275PLATFORM=linux
276
277PACKAGE_LIB_DIR=linux_$(PROCTYPE).plt
278UNOPKG_PLATFORM=Linux_$(PROCTYPE)
279JAVA_PROC_TYPE=$(PROCTYPE)
213
214EMPTYSTRING=
215PATH_SEPARATOR=:
216
217CC_FLAGS_JNI=-c -KPIC
218CC_FLAGS=-c -KPIC -xldscope=hidden
219ifeq "$(DEBUG)" "yes"
220CC_FLAGS_JNI+=-g

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

266# Settings for Linux using gcc compiler
267
268PROCTYPE := $(shell $(PRJ)/config.guess | cut -d "-" -f1 | sed -e 's/^i.86$$/i386/')
269PLATFORM=linux
270
271PACKAGE_LIB_DIR=linux_$(PROCTYPE).plt
272UNOPKG_PLATFORM=Linux_$(PROCTYPE)
273JAVA_PROC_TYPE=$(PROCTYPE)
280STLPORT=no
281
282ifeq "$(PROCTYPE)" "i386"
283PACKAGE_LIB_DIR=linux_x86.plt
284UNOPKG_PLATFORM=Linux_x86
285JAVA_PROC_TYPE=i386
274
275ifeq "$(PROCTYPE)" "i386"
276PACKAGE_LIB_DIR=linux_x86.plt
277UNOPKG_PLATFORM=Linux_x86
278JAVA_PROC_TYPE=i386
286STLPORT=yes
287endif
288
289ifeq "$(PROCTYPE)" "powerpc"
290PACKAGE_LIB_DIR=linux_powerpc.plt
291UNOPKG_PLATFORM=Linux_PowerPC
292JAVA_PROC_TYPE=ppc
279endif
280
281ifeq "$(PROCTYPE)" "powerpc"
282PACKAGE_LIB_DIR=linux_powerpc.plt
283UNOPKG_PLATFORM=Linux_PowerPC
284JAVA_PROC_TYPE=ppc
293STLPORT=yes
294endif
295
296ifeq "$(PROCTYPE)" "sparc"
297PACKAGE_LIB_DIR=linux_sparc.plt
298UNOPKG_PLATFORM=Linux_SPARC
299JAVA_PROC_TYPE=sparc
285endif
286
287ifeq "$(PROCTYPE)" "sparc"
288PACKAGE_LIB_DIR=linux_sparc.plt
289UNOPKG_PLATFORM=Linux_SPARC
290JAVA_PROC_TYPE=sparc
300STLPORT=yes
301endif
302
303ifeq "$(PROCTYPE)" "x86_64"
304JAVA_PROC_TYPE=amd64
305endif
306
307ifeq "$(PROCTYPE)" "powerpc64"
308JAVA_PROC_TYPE=ppc64

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

344include $(PRJ)/include/udkversion.mk
345
346SALLIB=-luno_sal
347CPPULIB=-luno_cppu
348CPPUHELPERLIB=-luno_cppuhelper$(COMID)
349SALHELPERLIB=-luno_salhelper$(COMID)
350REGLIB=-lreg
351STORELIB=-lstore
291endif
292
293ifeq "$(PROCTYPE)" "x86_64"
294JAVA_PROC_TYPE=amd64
295endif
296
297ifeq "$(PROCTYPE)" "powerpc64"
298JAVA_PROC_TYPE=ppc64

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

334include $(PRJ)/include/udkversion.mk
335
336SALLIB=-luno_sal
337CPPULIB=-luno_cppu
338CPPUHELPERLIB=-luno_cppuhelper$(COMID)
339SALHELPERLIB=-luno_salhelper$(COMID)
340REGLIB=-lreg
341STORELIB=-lstore
352ifeq "$(STLPORT)" "yes"
353ifeq "$(STLPORT_VER)" "500"
354STLPORTLIB=-lstlport
355else
356STLPORTLIB=-lstlport_gcc$(STLDEBUG)
357endif
358else
359STLPORTLIB=
360endif
361
362EMPTYSTRING=
363PATH_SEPARATOR=:
364
365CC_FLAGS_JNI=-c -fpic
366CC_FLAGS=-c -fpic -fvisibility=hidden
367# -O is necessary for inlining (see gcc documentation)
368ifeq "$(DEBUG)" "yes"

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

610include $(PRJ)/include/udkversion.mk
611
612SALLIB=-luno_sal
613CPPULIB=-luno_cppu
614CPPUHELPERLIB=-luno_cppuhelper$(COMID)
615SALHELPERLIB=-luno_salhelper$(COMID)
616REGLIB=-lreg
617STORELIB=-lstore
342
343EMPTYSTRING=
344PATH_SEPARATOR=:
345
346CC_FLAGS_JNI=-c -fpic
347CC_FLAGS=-c -fpic -fvisibility=hidden
348# -O is necessary for inlining (see gcc documentation)
349ifeq "$(DEBUG)" "yes"

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

591include $(PRJ)/include/udkversion.mk
592
593SALLIB=-luno_sal
594CPPULIB=-luno_cppu
595CPPUHELPERLIB=-luno_cppuhelper$(COMID)
596SALHELPERLIB=-luno_salhelper$(COMID)
597REGLIB=-lreg
598STORELIB=-lstore
618ifeq "$(STLPORT_VER)" "500"
619STLPORTLIB=-lstlport
620else
621STLPORTLIB=-lstlport_gcc$(STLDEBUG)
622endif
623
624EMPTYSTRING=
625PATH_SEPARATOR=:
626
627CC_FLAGS_JNI=-c -g -fPIC -DPIC $(PTHREAD_CFLAGS)
628CC_FLAGS=-c -g -fPIC -DPIC $(PTHREAD_CFLAGS) -fvisibility=hidden
629# -O is necessary for inlining (see gcc documentation)
630ifeq "$(DEBUG)" "yes"

--- 35 unchanged lines hidden --- 		599
600EMPTYSTRING=
601PATH_SEPARATOR=:
602
603CC_FLAGS_JNI=-c -g -fPIC -DPIC $(PTHREAD_CFLAGS)
604CC_FLAGS=-c -g -fPIC -DPIC $(PTHREAD_CFLAGS) -fvisibility=hidden
605# -O is necessary for inlining (see gcc documentation)
606ifeq "$(DEBUG)" "yes"

--- 35 unchanged lines hidden ---