diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-03-29 11:19:26 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-03-29 11:19:26 +0000 |
| commit | 107448d807de0c05e8bd9d9d5f27b401489bf74c (patch) | |
| tree | 2e2e5610e176b4c17be9077ffea3958989d58b58 /odk/settings | |
| parent | 5a6fd30d6d2fb5837e61d56032a0358585b141d5 (diff) | |
INTEGRATION: CWS sdkbugfix02 (1.11.8); FILE MERGED
2005/03/17 09:35:01 jsc 1.11.8.4: RESYNC: (1.12-1.13); FILE MERGED
2005/03/09 16:23:29 jsc 1.11.8.3: RESYNC: (1.11-1.12); FILE MERGED
2005/03/08 12:53:09 jl 1.11.8.2: #43561# renamed directory C# to CSharp. The uname from the System Tools for Unix on Windows shows Windows as OS, which was not taken into account yet.
2005/03/02 13:16:13 jsc 1.11.8.1: #i41147# change platform to freebsd
Diffstat (limited to 'odk/settings')
| -rw-r--r-- | odk/settings/settings.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index fb929510fcf6..1c80b5572ca7 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -51,7 +51,7 @@ SHAREDLIB_EXT=dll SHAREDLIB_OUT=$(OUT_BIN) PACKAGE_LIB_DIR=windows.plt UNOPKG_PLATFORM=Windows - + OSEP=^< CSEP=^> QUOTE= @@ -252,7 +252,7 @@ QM=\" SQM=' ECHOLINE=@echo P2BG=& - + DEL=rm -f DELRECURSIVE=rm -rf COPY=cp @@ -314,7 +314,7 @@ endif ########################################################################### ifeq "$(PLATFORM)" "darwin" # Settings for MacOSX using gcc 3.3 compiler - + # Default is MacOSX on a ppc machine PLATFORM=macosx PACKAGE_LIB_DIR=macosx_ppc.plt @@ -403,7 +403,7 @@ ifeq "$(PLATFORM)" "freebsd" PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1) # Default is freebsd on a intel machine -PLATFORM=FreeBSD +PLATFORM=freebsd PACKAGE_LIB_DIR=freebsd_x86.plt UNOPKG_PLATFORM=FreeBSD_x86 JAVA_PROC_TYPE=i386 @@ -420,7 +420,7 @@ OBJ_EXT=o SHAREDLIB_EXT=so SHAREDLIB_PRE=lib SHAREDLIB_OUT=$(OUT_LIB) - + GCC_VERSION=$(shell $(CC) -dumpversion) ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3" @@ -437,7 +437,7 @@ QUOTE=$(subst S,\,S) QM=\" ECHOLINE=@echo P2BG=& - + DEL=rm -f DELRECURSIVE=rm -rf COPY=cp |