Kaydet (Commit) bfed48d5 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Drop OS2

üst 9bc07d44
......@@ -135,19 +135,6 @@ OUT2LIB=$(BUILD_DIR)$/libcurl.lib
.ENDIF
.ENDIF # "$(GUI)"=="WNT"
.IF "$(GUI)"=="OS2"
BUILD_DIR=.$/lib
.IF "$(debug)"==""
BUILD_ACTION=make -f Makefile.os2
.ELSE
BUILD_ACTION=make -f Makefile.os2
.ENDIF
OUT2BIN=$(BUILD_DIR)$/libcurl.dll
OUT2LIB=$(BUILD_DIR)$/libcurl.lib
.ENDIF # "$(GUI)"=="OS2"
OUT2INC= \
include$/curl$/easy.h \
include$/curl$/multi.h \
......
......@@ -87,10 +87,6 @@ BUILD_ACTION=cd src/hunspell && dmake
.ENDIF
.ENDIF # "$(GUI)"=="WNT"
.IF "$(GUI)"=="OS2"
BUILD_ACTION=cd src/hunspell && dmake
.ENDIF # "$(GUI)"=="OS2"
OUT2INC= \
$(BUILD_DIR)$/src$/hunspell$/*.hxx \
$(BUILD_DIR)$/src$/hunspell$/*.h
......
......@@ -97,13 +97,8 @@ xml2_LDFLAGS+=-L$(SYSBASE)$/usr$/lib
.ENDIF # "$(SYSBASE)"!=""
CONFIGURE_DIR=
.IF "$(OS)"=="OS2"
CONFIGURE_ACTION=sh .$/configure
CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-static=yes --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS)" CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)"
.ELSE
CONFIGURE_ACTION=.$/configure
CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-shared --disable-static --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS) $(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)"
.ENDIF
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
......
......@@ -492,7 +492,7 @@
+#endif
--- misc/neon-0.29.5/src/makefile.mk 2011-02-03 10:32:38.000000000 +0100
+++ misc/build/neon-0.29.5/src/makefile.mk 2011-02-03 10:26:19.000000000 +0100
@@ -1,1 +1,99 @@
@@ -1,1 +1,96 @@
-dummy
+PRJ=..$/..$/..$/..$/..
+
......@@ -578,9 +578,6 @@
+ .IF "$(OS)"=="SOLARIS"
+ SHL1STDLIBS+= -lnsl -lsocket -ldl
+ .ENDIF # SOLARIS
+ .IF "$(OS)"=="OS2"
+ SHL1STDLIBS+= pthread.lib libz.lib
+ .ENDIF # OS2
+ .IF "$(SYSTEM_OPENSSL)"=="YES"
+ SHL1STDLIBS+= $(OPENSSLLIB)
+ .ELSE
......
......@@ -12,9 +12,6 @@ PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).dylib
PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).so.1.0
.ENDIF
PYTHONLIB=-lpython$(PYMAJOR).$(PYMINOR)
.ELIF "$(GUI)" == "OS2"
PY_FULL_DLL_NAME=python$(PYMAJOR)$(PYMINOR).dll
PYTHONLIB=python$(PYMAJOR)$(PYMINOR).lib
.ELSE
.IF "$(COM)" == "GCC"
PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).dll
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment