Open Watcom (DOS target) support

Author: SamuelMarks

CMakeLists.txt

@@ -6,10 +6,14 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN YES)
 set(CMAKE_C_STANDARD 90)
 
 add_library("${PROJECT_NAME}_compiler_flags" INTERFACE)
-message(STATUS "MSVC_VERSION = ${MSVC_VERSION}")
-if (NOT DEFINED MSVC_VERSION OR MSVC_VERSION STRGREATER "1900") # 2015
+if (NOT DEFINED MSVC_VERSION
+        OR MSVC_VERSION STRGREATER "1900" # 2015
+        OR NOT (CMAKE_C_COMPILER_ID STREQUAL "OpenWatcom"))
     target_compile_features("${PROJECT_NAME}_compiler_flags" INTERFACE "c_std_${CMAKE_C_STANDARD}")
-elseif (MSVC_VERSION STRLESS_EQUAL "1900" AND NOT EXISTS "${CMAKE_BINARY_DIR}/c89stringutils_export.h")
+elseif ((MSVC_VERSION STRLESS_EQUAL "1900"
+         OR CMAKE_C_COMPILER_ID STREQUAL "OpenWatcom"
+         OR CYGWIN)
+        AND NOT EXISTS "${CMAKE_BINARY_DIR}/c89stringutils_export.h")
     file(COPY "${CMAKE_SOURCE_DIR}/c89stringutils/c89stringutils_export_pregen.h"
             DESTINATION "${CMAKE_BINARY_DIR}")
     file(RENAME "${CMAKE_BINARY_DIR}/c89stringutils_export_pregen.h"

README.md

@@ -6,12 +6,19 @@ c89stringutils
 [![C89](https://img.shields.io/badge/C-89-blue)](https://en.wikipedia.org/wiki/C89_(C_version))
 
 C89 is missing some nice things. As is MSVC.
-This adds the string related functionality for Windows (particularly: MSVC) and is tested additionally on: SunOS, Linux, BSD, and macOS.
+This adds the string related functionality for:
+- Windows
+  - MSVC 2005
+  - MSVC 2022 (should support all other versions also)
+  - MinGW
+  - Open Watcom 2.0 (including DOS target)
+- SunOS
+- Linux
+- BSD
+- macOS
 
 Everything is hidden behind `ifdef`s so if the compiler/OS supports the function, that function will be used instead of the one provided by this library.
 
-Header only (to simplify including). Just `#define C89STRINGUTILS_IMPLEMENTATION` once-only in your program (before including the header).
-
 ### String functions implemented
 
   | Function                                                                | Citation                     |
@@ -29,16 +36,48 @@ Additionally `jasprintf`, a version of `asprintf` that concatenates on successiv
 
 ### Dependencies
 
-- [CMake](https://cmake.org) (3.11 or later)
+- [CMake](https://cmake.org) (3.11 for MSVC 2005 or newer versions for other targets)
 - C compiler (any that work with CMake, and were released within the last 30 years)
 
-### Build
+### Configure, build, and test
 
 ```bash
 mkdir build && cd build
 cmake ..
 cmake --build .
+ctest -C Debug
+```
+
+#### Instructions for MSVC 2005
+
+With cmake-3.11.4 specified, do:
+```sh
+mkdir build_msvc2005 && cd build_msvc2005
+cmake-3.11.4-win64-x64\bin\cmake -DCMAKE_WARN_VS8=OFF -DCMAKE_BUILD_TYPE="Debug" -G "Visual Studio 8 2005" ..
+cmake-3.11.4-win64-x64\bin\cmake --build .
+cmake-3.11.4-win64-x64\bin\ctest -C Debug
+```
+(the last two commands can be run by opening the solution in Visual Studio 2005)
+
+Alternatively with newer versions of CMake (tested 3.26.3):
+```sh
+mkdir build_msvc_nmake2005 && cd build_msvc_nmake2005
+cmake -DCMAKE_BUILD_TYPE="Debug" -G "NMake Makefiles" ..
+cmake --build .
+ctest -C Debug
+```
+
+#### Instructions for Open Watcom (DOS target)
+
+With v2 from https://github.com/open-watcom/open-watcom-v2/releases installed:
+```sh
+WATCOM\owsetenv.bat
+mkdir build_dos && cd build_dos
+cmake -G "Watcom WMake" -D CMAKE_SYSTEM_NAME "DOS" -D CMAKE_SYSTEM_PROCESSOR "I86" ..
+cmake --build .
+ctest -C Debug
 ```
+(that test phase might fail if you're running this on a non-DOS host)
 
 ---
 

c89stringutils/c89stringutils_string_extras.h

@@ -10,8 +10,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "c89stringutils_export.h"
-
 #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) ||     \
     defined(__bsdi__) || defined(__DragonFly__) || defined(BSD)
 #define ANY_BSD
@@ -42,6 +40,8 @@
 
 #endif /* defined(_MSC_VER) && !defined(__INTEL_COMPILER) */
 
+#elif defined(__WATCOMC__)
+
 #else
 
 #include <sys/param.h>
@@ -69,6 +69,13 @@
 #endif /* defined(WIN32) || defined(_WIN32) || defined(__WIN32__) ||           \
           defined(__NT__) */
 
+#if OLD_MSVC || defined(__WATCOMC__) || defined(__CYGWIN__)
+#ifdef C89STRINGUTILS_EXPORT
+#undef C89STRINGUTILS_EXPORT
+#endif /* C89STRINGUTILS_EXPORT */
+#define C89STRINGUTILS_EXPORT __declspec(dllimport)
+#endif
+
 #if defined(__STDC_LIB_EXT1__) && __STDC_WANT_LIB_EXT1__
 
 #define HAVE_STRERRORLEN_S

c89stringutils_tests/test_c89stringutils/CMakeLists.txt

@@ -31,8 +31,10 @@ source_group("Source Files" FILES "${Source_Files}")
 
 add_executable("${EXEC_NAME}" "${Header_Files}" "${Source_Files}")
 
-target_link_libraries("${EXEC_NAME}" PRIVATE "c89stringutils_compiler_flags" "c89stringutils")
-
+target_link_libraries("${EXEC_NAME}" PRIVATE "c89stringutils")
+if (NOT CMAKE_C_COMPILER_ID STREQUAL "OpenWatcom")
+    target_link_libraries("${EXEC_NAME}" PRIVATE "c89stringutils_compiler_flags" "c89stringutils")
+endif (NOT CMAKE_C_COMPILER_ID STREQUAL "OpenWatcom")
 target_include_directories(
         "${EXEC_NAME}"
         PRIVATE

c89stringutils_tests/test_c89stringutils/test.c

@@ -1,7 +1,3 @@
-#ifdef _MSC_VER
-#endif /* _MSC_VER */
-#define _CRT_SECURE_NO_WARNINGS 1
-
 #include <greatest.h>
 
 #include "test_string_extras.h"