attempting to add os/2

git-svn-id: file:///raid/svn-personal/tewi/trunk@311 8739d7e6-ffea-ec47-b151-bdff447c6205

diff --git a/Platform/os2.mk b/Platform/os2.mk
new file mode 100644 (file)
index 0000000..e4292f6
--- /dev/null
+++ b/Platform/os2.mk
@@ -0,0 +1,17 @@
+# $Id$
+
+PREFIX = C:/Tewi
+
+PLATFORM_IDENT = OS2_WATCOM
+CC = owcc
+AR = wlib
+AR_FLAGS = -q -b -n -fo
+CFLAGS = -b os2v2$(END) -I $(WATCOM)/h/os2 -g -std=c99 -DPREFIX=\"$(PREFIX)\" -I ../Common -fPIC
+LDFLAGS = -b os2v2$(END)
+LIBS =
+EXEC = .exe
+STATIC = lib
+LIBSUF = .dll
+OBJ = obj
+REQOBJS = concat.rc
+SERVADD = wrc -bt=nt -i=$(WATCOM)/h/nt concat.rc tewi.exe

diff --git a/Server/config.c b/Server/config.c
index c42109d1819c71e87e9bcba5d7a7df2047d81fad..a998d6797077d68c90bfd06f49c3e93d17ef3422 100644 (file)
--- a/Server/config.c
+++ b/Server/config.c
@@ -15,7 +15,7 @@
 #include <unistd.h>
 #endif
 
-#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__)
+#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || (defined(__WATCOMC__) && !defined(__OS2__))
 #ifdef USE_WINSOCK1
 #include <winsock.h>
 #else

diff --git a/Server/main.c b/Server/main.c
index 8e171047739c02bc94e6fe06fd4af8752753edb2..6eb61361a581fbd8b28928b93108ffd63ed5908d 100644 (file)
--- a/Server/main.c
+++ b/Server/main.c
@@ -30,7 +30,7 @@
 #include "tw_server.h"
 #include "tw_version.h"
 
-#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__)
+#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || (defined(__WATCOMC__) && !defined(__OS2__))
 #include <windows.h>
 #endif
 
@@ -88,7 +88,7 @@ char tw_server[2048];
 
 int startup(int argc, char** argv);
 
-#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__WATCOMC__) || defined(__BORLANDC__)
+#if defined(__MINGW32__) || defined(_MSC_VER) || (defined(__WATCOMC__) && !defined(__OS2__)) || defined(__BORLANDC__)
 char* get_registry(const char* main, const char* sub) {
        DWORD bufsize = 512;
        HKEY handle;
@@ -717,7 +717,7 @@ int main(int argc, char** argv) {
 int startup(int argc, char** argv) {
        int i;
        char* r;
-#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__WATCOMC__) || defined(__BORLANDC__)
+#if defined(__MINGW32__) || defined(_MSC_VER) || (defined(__WATCOMC__) && !defined(__OS2__)) || defined(__BORLANDC__)
        char* confpath = cm_strdup(PREFIX "/etc/tewi.conf");
        char* regpath = get_registry("Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Tewi HTTPd", "InstallDir");
        if(regpath != NULL) {

diff --git a/Server/server.c b/Server/server.c
index 0d7cea48c5ff67fdacf637ceecb884250b05c005..2069b6ae725a5db3aeacc31b72746e87687b1cdd 100644 (file)
--- a/Server/server.c
+++ b/Server/server.c
@@ -32,7 +32,7 @@
 #include <cm_log.h>
 #include <cm_dir.h>
 
-#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__)
+#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || (defined(__WATCOMC__) && !defined(__OS2__))
 #ifndef NO_GETNAMEINFO
 #include <ws2tcpip.h>
 #include <wspiapi.h>

diff --git a/Server/tw_config.h b/Server/tw_config.h
index 498edb52f0efbed19f2802e18ed881e6bce5287d..7d255634c4bee45d7c06acfe3ad850c4b46d8973 100644 (file)
--- a/Server/tw_config.h
+++ b/Server/tw_config.h
@@ -14,7 +14,7 @@ extern "C" {
 #include <stdint.h>
 #include <stdbool.h>
 
-#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__)
+#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || (defined(__WATCOMC__) && !defined(__OS2__))
 #ifdef USE_WINSOCK1
 #include <winsock.h>
 #else

diff --git a/config.h.tmpl b/config.h.tmpl
index dc6b83a516ddb980fc87f5564415d7277d74073e..5025b2f974d2a405b54471b98bddc3e991a3f3dc 100644 (file)
--- a/config.h.tmpl
+++ b/config.h.tmpl
@@ -19,7 +19,7 @@
 #define SSL void
 #endif
 
-#if (defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__)) && defined(BUILD_GUI) && !defined(SERVICE)
+#if (defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || (defined(__WATCOMC__) && !defined(__OS2__))) && defined(BUILD_GUI) && !defined(SERVICE)
 #define BUILD_GUI_VALID
 #endif