summaryrefslogtreecommitdiff
path: root/shell/source
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2008-07-22 16:47:09 +0000
committerOliver Bolte <obo@openoffice.org>2008-07-22 16:47:09 +0000
commit1b3580f812c43390f8edd67c0e3d4a71d14433fc (patch)
treea36271bf85eeff8924e3bd44d21f80ab7767c15c /shell/source
parent9f37bee447d976bf02890ea0c670187d739dd23d (diff)
INTEGRATION: CWS os2port03 (1.6.18); FILE MERGED
2008/07/17 05:25:32 obr 1.6.18.3: RESYNC: (1.6-1.8); FILE MERGED 2008/04/15 14:32:18 ydario 1.6.18.2: Issue number: i85203 Submitted by: ydario Reviewed by: ydario 2008/01/14 17:02:04 ydario 1.6.18.1: build also os2 subprojects. Issue number:i85203 Submitted by:ydario
Diffstat (limited to 'shell/source')
-rwxr-xr-xshell/source/all/makefile.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/shell/source/all/makefile.mk b/shell/source/all/makefile.mk
index 7e23344a02..3695abae79 100755
--- a/shell/source/all/makefile.mk
+++ b/shell/source/all/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.9 $
#
# This file is part of OpenOffice.org.
#
@@ -50,7 +50,6 @@ CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
CDEFS_X64+=-D_WIN32_IE=0x501
.ENDIF # "$(BUILD_X64)"!=""
.ENDIF
-
.IF "$(GUI)" == "OS2"
CFLAGS+=-DISOLATION_AWARE_ENABLED -DXML_UNICODE -DXML_UNICODE_WCHAR_T -DUNICODE -D_UNICODE
.ENDIF