From d0ecd9768c8b4729f33efc48f13c36d666cc4b0e Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann <ihi@openoffice.org>
Date: Mon, 15 Oct 2007 14:40:32 +0000
Subject: [PATCH] INTEGRATION: CWS dmake411 (1.2.2); FILE MERGED 2007/10/11
 20:36:31 vq 1.2.2.3: #i81855# Add a comment about building dmake on OS/2.
 2007/09/23 22:05:02 vq 1.2.2.2: #i81855# More changes for the OS/2 port.
 Patch provided by Yuri Dario. 2007/09/22 22:27:27 vq 1.2.2.1: #i81855# Revert
 change to make.cmd as it refers to a non-existing script in
 dmake\os2\gcc\emx\mk.cmd.

---
 dmake/make.cmd | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/dmake/make.cmd b/dmake/make.cmd
index 0edcbfba4d3b..c0d490ddd969 100755
--- a/dmake/make.cmd
+++ b/dmake/make.cmd
@@ -1,5 +1,18 @@
-@echo off
-rem cls
+echo off
+
+REM * This script is deprecated for OS/2 libc 06x building! Use the configure
+REM * mechanism. Run the following commands your OS/2 shell:
+REM * 
+REM * set CFLAGS=-g -Zomf -O3 -march=pentium -mcpu=pentium4
+REM * set CXXFLAGS=-g -Zomf -O3 -march=pentium -mcpu=pentium4
+REM * set LDFLAGS=-s -Zsym -Zmap -Zhigh-mem -Zomf -Zexe -Zargs-wild -Zargs-resp
+REM * set LN_CP_F=cp.exe
+REM * set RANLIb=echo
+REM * set AR=emxomfar -p128
+REM * sh -c "./configure --enable-spawn"
+REM * make.exe
+
+cls
 rem  *** This is the make command file that is used under OS/2 to make the
 rem  *** first version of dmake.  It isn't pretty but it does work, assuming
 rem  *** the compilers have been correctly setup.
@@ -7,7 +20,6 @@ rem
 
 if %0%1 == %0 goto error
 
-if %1 == os2-gcc     goto mkgcc
 if %1 == os2-ibm     goto mkibm
 if %1 == os2-ibm3     goto mkibm3
 if %1 == winnt-bcc40 goto mkwntb40
@@ -20,7 +32,6 @@ rem label the possible DOS variations for dmake here.
 :error
 echo OS/2 INDEX:  You must specify one of:
 echo ------------------
-echo    os2-gcc      - GCC (innotek/emx) compile.
 echo    os2-ibm      - IBM OS/2 ICC compile.
 echo    os2-ibm3      - IBM OS/2 ICC3 compile.
 echo    winnt-bcc40  - Windows-NT Borland C++ 4.0 Compile
@@ -29,11 +40,6 @@ echo    winnt-bcc50  - Windows-NT Borland C++ 5.0 Compile
 echo    winnt-vpp40  - Windows-NT Microsoft VC++ 4.0 Compile
 goto end
 
-rem This is the script that bilds OS/2 dmake using GCC (innotek/emx)
-:mkgcc
-call os2\gcc\emx\mk.cmd
-goto end
-
 rem This is the script that bilds OS/2 dmake using IBM ICC Compiler
 :mkibm
 os2\ibm\icc\mk.cmd
@@ -105,6 +111,5 @@ goto end
 winnt\microsft\vpp40\mk.bat
 goto end
 
+rem All done!
 :end
-REM dllrname libc06r1=libc06y1 dmake.exe
-echo All done!