settings.mk (e15a4534) settings.mk (78ecfec3)
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

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

340
341ifeq "$(PROCTYPE)" "ppc"
342CC_FLAGS+=-fPIC
343endif
344
345SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/include/linux"
346CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
347STL_INCLUDES=-I"$(OO_SDK_HOME)/include/stl"
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

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

340
341ifeq "$(PROCTYPE)" "ppc"
342CC_FLAGS+=-fPIC
343endif
344
345SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/include/linux"
346CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
347STL_INCLUDES=-I"$(OO_SDK_HOME)/include/stl"
348CC_DEFINES_JNI=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH)
349CC_DEFINES=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) -DHAVE_GCC_VISIBILITY_FEATURE
348CC_DEFINES_JNI=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV)
349CC_DEFINES=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) -DHAVE_GCC_VISIBILITY_FEATURE
350
351# define for used compiler necessary for UNO
352#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95
353#-DCPPU_ENV=gcc3 -- gcc3 3.0
354
355CC_OUTPUT_SWITCH=-o
356
357LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN'

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

459else
460CC_FLAGS_JNI+=-O
461CC_FLAGS+=-O
462endif
463
464SDK_JAVA_INCLUDES = -I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers -I/System/Library/Frameworks/JavaVM.framework/Headers
465CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
466STL_INCLUDES=-I"$(OO_SDK_HOME)/include/stl"
350
351# define for used compiler necessary for UNO
352#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95
353#-DCPPU_ENV=gcc3 -- gcc3 3.0
354
355CC_OUTPUT_SWITCH=-o
356
357LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN'

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

459else
460CC_FLAGS_JNI+=-O
461CC_FLAGS+=-O
462endif
463
464SDK_JAVA_INCLUDES = -I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers -I/System/Library/Frameworks/JavaVM.framework/Headers
465CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
466STL_INCLUDES=-I"$(OO_SDK_HOME)/include/stl"
467CC_DEFINES_JNI=-DUNX -DGCC -DMACOSX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH)
468CC_DEFINES=-DUNX -DGCC -DMACOSX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) -DHAVE_GCC_VISIBILITY_FEATURE
467CC_DEFINES_JNI=-DUNX -DGCC -DMACOSX -DCPPU_ENV=$(CPPU_ENV)
468CC_DEFINES=-DUNX -DGCC -DMACOSX -DCPPU_ENV=$(CPPU_ENV) -DHAVE_GCC_VISIBILITY_FEATURE
469
470CC_OUTPUT_SWITCH=-o
471
472LIBRARY_LINK_FLAGS=-dynamiclib -single_module -Wl,-multiply_defined,suppress $(GCC_ARCH_OPTION)
473#-fPIC -fno-common
474
475# install_name '@executable_path$/(@:f)'
476#COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -Wl,-exported_symbols_list $(COMP_MAPFILE)

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

580else
581CC_FLAGS_JNI+=-O
582CC_FLAGS+=-O
583endif
584
585SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/include/freebsd"
586CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
587STL_INCLUDES=-I"$(OO_SDK_HOME)/include/stl"
469
470CC_OUTPUT_SWITCH=-o
471
472LIBRARY_LINK_FLAGS=-dynamiclib -single_module -Wl,-multiply_defined,suppress $(GCC_ARCH_OPTION)
473#-fPIC -fno-common
474
475# install_name '@executable_path$/(@:f)'
476#COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -Wl,-exported_symbols_list $(COMP_MAPFILE)

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

580else
581CC_FLAGS_JNI+=-O
582CC_FLAGS+=-O
583endif
584
585SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/include/freebsd"
586CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
587STL_INCLUDES=-I"$(OO_SDK_HOME)/include/stl"
588CC_DEFINES_JNI=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH)
589CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) -DHAVE_GCC_VISIBILITY_FEATURE
588CC_DEFINES_JNI=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV)
589CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -DHAVE_GCC_VISIBILITY_FEATURE
590
591CC_OUTPUT_SWITCH=-o
592
593LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN'
594#COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -Wl,--version-script,$(PRJ)/settings/component.uno.map
595COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS)
596
597EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined

--- 15 unchanged lines hidden --- 		590
591CC_OUTPUT_SWITCH=-o
592
593LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN'
594#COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -Wl,--version-script,$(PRJ)/settings/component.uno.map
595COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS)
596
597EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined

--- 15 unchanged lines hidden ---