diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-12-09 08:43:20 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-12-09 08:43:20 +0000 |
commit | e3ee495f2b9b5e70f00bb54ea983a77ac0e28550 (patch) | |
tree | 69dd97b8cd5c9a4a4a44bc2e2eab323776ac3cf4 /lpsolve/makefile.mk | |
parent | fae8f0f1439964e4b3cbf1dae5bd91bf4924ebfd (diff) |
CWS-TOOLING: integrate CWS os2port04
2008-11-27 13:22:38 +0100 ydario r264480 : #i96439#: fix build for unix platforms.
2008-11-26 18:32:42 +0100 ydario r264433 : #i96439#: os2 systemshell code (dummy code).
2008-11-26 16:33:48 +0100 ydario r264421 : #i96439#: vcl fix for pdf export of truetype fonts.
2008-11-26 15:04:44 +0100 ydario r264399 : #i96439#: build macros fix scripts, gcc specific flags.
2008-11-26 15:00:15 +0100 ydario r264398 : #i96439#: vcl source code updates.
2008-11-26 13:21:37 +0100 ydario r264378 : #i96439#: os2 build system fixes.
2008-11-26 13:20:27 +0100 ydario r264377 : #i96439#: configuration and build macros updates.
2008-11-26 13:16:35 +0100 ydario r264375 : #i96439#: new launcher code, build system updates.
2008-11-26 13:12:49 +0100 ydario r264373 : #i96439#: use OSL endian macro.
2008-11-26 12:54:50 +0100 ydario r264371 : #i96439#: os2 build system fixes.
2008-11-26 12:30:46 +0100 ydario r264367 : #i96439#: os2 build system fixes.
2008-11-26 12:09:33 +0100 ydario r264365 : #i96439#: _Export is a reserved keyword under gcc for os2.
2008-11-26 12:08:12 +0100 ydario r264364 : #i96439#: new libpath handling.
2008-11-26 11:57:51 +0100 ydario r264363 : #i96439#: use C call, generates proper stabs; fix rtti names.
Diffstat (limited to 'lpsolve/makefile.mk')
-rw-r--r-- | lpsolve/makefile.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk index 0c319726e298..b36abbebb29b 100644 --- a/lpsolve/makefile.mk +++ b/lpsolve/makefile.mk @@ -46,7 +46,7 @@ TARFILE_NAME=lp_solve_5.5 PATCH_FILE_NAME=lp_solve_5.5-windows.patch .ELSE PATCH_FILE_NAME=lp_solve_5.5.patch -ADDITIONAL_FILES=lpsolve55$/ccc.solaris +ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2 .ENDIF CONFIGURE_DIR= @@ -62,6 +62,9 @@ BUILD_ACTION=cmd /c cvc6.bat OUT2LIB=$(BUILD_DIR)$/lpsolve55.lib .ENDIF OUT2BIN=$(BUILD_DIR)$/lpsolve55.dll +.ELIF "$(GUI)"=="OS2" +BUILD_ACTION=sh ccc.os2 +OUT2LIB=$(BUILD_DIR)$/liblpsolve55.lib .ELSE .IF "$(OS)"=="MACOSX" BUILD_ACTION=sh ccc.osx |