Changeset 311 in Main for trunk

Timestamp:

Oct 13, 2024, 10:23:22 AM (5 weeks ago)

Author:

Nishi

Message:

attempting to add os/2

Location:

trunk

Files:

• Platform/os2.mk (copied) (copied from trunk/Platform/watcom.mk ) (1 diff)
• Server/config.c (modified) (1 diff)
• Server/main.c (modified) (3 diffs)
• Server/server.c (modified) (1 diff)
• Server/tw_config.h (modified) (1 diff)
• config.h.tmpl (modified) (1 diff)

trunk/Platform/os2.mk

@@ -3 +3 @@
 PREFIX = C:/Tewi
 
-PLATFORM_IDENT = WINDOWS_WATCOM
+PLATFORM_IDENT = OS2_WATCOM
 CC = owcc
 AR = wlib
 AR_FLAGS = -q -b -n -fo
-CFLAGS = -b nt$(END) -I $(WATCOM)/h/nt -g -std=c99 -DPREFIX=\"$(PREFIX)\" -I ../Common -fPIC
-LDFLAGS = -b nt$(END)
+CFLAGS = -b os2v2$(END) -I $(WATCOM)/h/os2 -g -std=c99 -DPREFIX=\"$(PREFIX)\" -I ../Common -fPIC
+LDFLAGS = -b os2v2$(END)
 LIBS =
 EXEC = .exe

trunk/Server/config.c

@@ -16 +16 @@
 #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>

trunk/Server/main.c

@@ -31 +31 @@
 #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
@@ -89 +89 @@
 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;
@@ -718 +718 @@
         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");

trunk/Server/server.c

@@ -33 +33 @@
 #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>

trunk/Server/tw_config.h

@@ -15 +15 @@
 #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>

trunk/config.h.tmpl

@@ -20 +20 @@
 #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