From 0ab583d78770b1e8babe83924321881b0710b420 Mon Sep 17 00:00:00 2001 From: Jiri Malak Date: Fri, 1 May 2020 16:03:48 +0200 Subject: OpenWatcom: Add DOS target support DOS 16-bit and 32-bit target support files for cross-compilation by OpenWatcom. It is used if CMAKE_SYSTEM_NAME=DOS is defined. If CMAKE_SYSTEM_PROCESSOR=I86 is defined then 16-bit DOS target is used, otherwise 32-bit DOS target is used. --- Modules/Platform/DOS-OpenWatcom-C.cmake | 1 + Modules/Platform/DOS-OpenWatcom-CXX.cmake | 1 + Modules/Platform/DOS-OpenWatcom.cmake | 28 ++++++++++++++++++++++++++++ Modules/Platform/DOS.cmake | 14 ++++++++++++++ 4 files changed, 44 insertions(+) create mode 100644 Modules/Platform/DOS-OpenWatcom-C.cmake create mode 100644 Modules/Platform/DOS-OpenWatcom-CXX.cmake create mode 100644 Modules/Platform/DOS-OpenWatcom.cmake create mode 100644 Modules/Platform/DOS.cmake diff --git a/Modules/Platform/DOS-OpenWatcom-C.cmake b/Modules/Platform/DOS-OpenWatcom-C.cmake new file mode 100644 index 0000000..cf71c84 --- /dev/null +++ b/Modules/Platform/DOS-OpenWatcom-C.cmake @@ -0,0 +1 @@ +include(Platform/DOS-OpenWatcom) diff --git a/Modules/Platform/DOS-OpenWatcom-CXX.cmake b/Modules/Platform/DOS-OpenWatcom-CXX.cmake new file mode 100644 index 0000000..cf71c84 --- /dev/null +++ b/Modules/Platform/DOS-OpenWatcom-CXX.cmake @@ -0,0 +1 @@ +include(Platform/DOS-OpenWatcom) diff --git a/Modules/Platform/DOS-OpenWatcom.cmake b/Modules/Platform/DOS-OpenWatcom.cmake new file mode 100644 index 0000000..54c452e --- /dev/null +++ b/Modules/Platform/DOS-OpenWatcom.cmake @@ -0,0 +1,28 @@ + +# This module is shared by multiple languages; use include blocker. +include_guard() + +set(CMAKE_BUILD_TYPE_INIT Debug) + +if(DEFINED CMAKE_SYSTEM_PROCESSOR AND CMAKE_SYSTEM_PROCESSOR STREQUAL "I86") + string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " system dos") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " system dos") + string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT " system dos") +else() + string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " system dos4g") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " system dos4g") + string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT " system dos4g") +endif() + +set(CMAKE_C_COMPILE_OPTIONS_DLL "-bd") # Note: This variable is a ';' separated list +set(CMAKE_SHARED_LIBRARY_C_FLAGS "-bd") # ... while this is a space separated string. + +string(APPEND CMAKE_C_FLAGS_INIT " -bt=dos") +string(APPEND CMAKE_CXX_FLAGS_INIT " -bt=dos -xs") + +if(NOT CMAKE_C_STANDARD_INCLUDE_DIRECTORIES) + set(CMAKE_C_STANDARD_INCLUDE_DIRECTORIES $ENV{WATCOM}/h) +endif() +if(NOT CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES) + set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES $ENV{WATCOM}/h) +endif() diff --git a/Modules/Platform/DOS.cmake b/Modules/Platform/DOS.cmake new file mode 100644 index 0000000..fc95936 --- /dev/null +++ b/Modules/Platform/DOS.cmake @@ -0,0 +1,14 @@ +set(DOS 1) + +set(CMAKE_STATIC_LIBRARY_PREFIX "") +set(CMAKE_STATIC_LIBRARY_SUFFIX ".lib") +set(CMAKE_SHARED_LIBRARY_PREFIX "") +set(CMAKE_SHARED_LIBRARY_SUFFIX ".dll") +set(CMAKE_IMPORT_LIBRARY_PREFIX "") +set(CMAKE_IMPORT_LIBRARY_SUFFIX ".lib") +set(CMAKE_EXECUTABLE_SUFFIX ".exe") +set(CMAKE_LINK_LIBRARY_SUFFIX ".lib") +set(CMAKE_DL_LIBS "") + +set(CMAKE_FIND_LIBRARY_PREFIXES "") +set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib") -- cgit v0.12 From d26eea220ac0da56f70b9bc2591131fa32d4b399 Mon Sep 17 00:00:00 2001 From: Jiri Malak Date: Fri, 1 May 2020 16:06:25 +0200 Subject: OpenWatcom: Add OS/2 target support OS/2 16-bit and 32-bit target support files for cross-compilation by OpenWatcom. It is used if CMAKE_SYSTEM_NAME=OS2 is defined. If CMAKE_SYSTEM_PROCESSOR=I86 is defined then 16-bit OS/2 target is used, otherwise 32-bit OS/2 target is used. --- Modules/Platform/OS2-OpenWatcom-C.cmake | 1 + Modules/Platform/OS2-OpenWatcom-CXX.cmake | 1 + Modules/Platform/OS2-OpenWatcom.cmake | 35 +++++++++++++++++++++++++++++++ Modules/Platform/OS2.cmake | 14 +++++++++++++ 4 files changed, 51 insertions(+) create mode 100644 Modules/Platform/OS2-OpenWatcom-C.cmake create mode 100644 Modules/Platform/OS2-OpenWatcom-CXX.cmake create mode 100644 Modules/Platform/OS2-OpenWatcom.cmake create mode 100644 Modules/Platform/OS2.cmake diff --git a/Modules/Platform/OS2-OpenWatcom-C.cmake b/Modules/Platform/OS2-OpenWatcom-C.cmake new file mode 100644 index 0000000..21a4d9e --- /dev/null +++ b/Modules/Platform/OS2-OpenWatcom-C.cmake @@ -0,0 +1 @@ +include(Platform/OS2-OpenWatcom) diff --git a/Modules/Platform/OS2-OpenWatcom-CXX.cmake b/Modules/Platform/OS2-OpenWatcom-CXX.cmake new file mode 100644 index 0000000..21a4d9e --- /dev/null +++ b/Modules/Platform/OS2-OpenWatcom-CXX.cmake @@ -0,0 +1 @@ +include(Platform/OS2-OpenWatcom) diff --git a/Modules/Platform/OS2-OpenWatcom.cmake b/Modules/Platform/OS2-OpenWatcom.cmake new file mode 100644 index 0000000..998fb9f --- /dev/null +++ b/Modules/Platform/OS2-OpenWatcom.cmake @@ -0,0 +1,35 @@ +# This module is shared by multiple languages; use include blocker. +include_guard() + +set(CMAKE_BUILD_TYPE_INIT Debug) + +if(DEFINED CMAKE_SYSTEM_PROCESSOR AND CMAKE_SYSTEM_PROCESSOR STREQUAL "I86") + string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " system os2") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " system os2_dll") + string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT " system os2_dll") +else() + string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " system os2v2") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " system os2v2_dll") + string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT " system os2v2_dll") +endif() + +set(CMAKE_C_COMPILE_OPTIONS_DLL "-bd") # Note: This variable is a ';' separated list +set(CMAKE_SHARED_LIBRARY_C_FLAGS "-bd") # ... while this is a space separated string. + +string(APPEND CMAKE_C_FLAGS_INIT " -bt=os2") +string(APPEND CMAKE_CXX_FLAGS_INIT " -bt=os2 -xs") + +if(NOT CMAKE_C_STANDARD_INCLUDE_DIRECTORIES) + if(DEFINED CMAKE_SYSTEM_PROCESSOR AND CMAKE_SYSTEM_PROCESSOR STREQUAL "I86") + set(CMAKE_C_STANDARD_INCLUDE_DIRECTORIES $ENV{WATCOM}/h $ENV{WATCOM}/h/os21x) + else() + set(CMAKE_C_STANDARD_INCLUDE_DIRECTORIES $ENV{WATCOM}/h $ENV{WATCOM}/h/os2) + endif() +endif() +if(NOT CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES) + if(DEFINED CMAKE_SYSTEM_PROCESSOR AND CMAKE_SYSTEM_PROCESSOR STREQUAL "I86") + set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES $ENV{WATCOM}/h $ENV{WATCOM}/h/os21x) + else() + set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES $ENV{WATCOM}/h $ENV{WATCOM}/h/os2) + endif() +endif() diff --git a/Modules/Platform/OS2.cmake b/Modules/Platform/OS2.cmake new file mode 100644 index 0000000..a9df66d --- /dev/null +++ b/Modules/Platform/OS2.cmake @@ -0,0 +1,14 @@ +set(OS2 1) + +set(CMAKE_STATIC_LIBRARY_PREFIX "") +set(CMAKE_STATIC_LIBRARY_SUFFIX ".lib") +set(CMAKE_SHARED_LIBRARY_PREFIX "") +set(CMAKE_SHARED_LIBRARY_SUFFIX ".dll") +set(CMAKE_IMPORT_LIBRARY_PREFIX "") +set(CMAKE_IMPORT_LIBRARY_SUFFIX ".lib") +set(CMAKE_EXECUTABLE_SUFFIX ".exe") +set(CMAKE_LINK_LIBRARY_SUFFIX ".lib") +set(CMAKE_DL_LIBS "") + +set(CMAKE_FIND_LIBRARY_PREFIXES "") +set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib") -- cgit v0.12 From 43c3243c2d344ae0bd62307893f49019fd335b71 Mon Sep 17 00:00:00 2001 From: Jiri Malak Date: Fri, 1 May 2020 16:12:02 +0200 Subject: OpenWatcom: Fix Linux support file Fix CMAKE_SHARED_LINKER_FLAGS_INIT macro Fix executable file name for Linux to be without extension Add system header files directory for cross-compilation --- Modules/Platform/Linux-OpenWatcom.cmake | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Modules/Platform/Linux-OpenWatcom.cmake b/Modules/Platform/Linux-OpenWatcom.cmake index df23366..5b4e995 100644 --- a/Modules/Platform/Linux-OpenWatcom.cmake +++ b/Modules/Platform/Linux-OpenWatcom.cmake @@ -4,13 +4,22 @@ # This module is shared by multiple languages; use include blocker. include_guard() -string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " system linux") -string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT " system linux") -string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " system linux") - set(CMAKE_BUILD_TYPE_INIT Debug) +string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " system linux opt noextension") +string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT " system linux") +string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " system linux") + # single/multi-threaded /-bm # default is setup for single-threaded libraries string(APPEND CMAKE_C_FLAGS_INIT " -bt=linux") string(APPEND CMAKE_CXX_FLAGS_INIT " -bt=linux -xs") + +if(CMAKE_CROSSCOMPILING) + if(NOT CMAKE_C_STANDARD_INCLUDE_DIRECTORIES) + set(CMAKE_C_STANDARD_INCLUDE_DIRECTORIES $ENV{WATCOM}/lh) + endif() + if(NOT CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES) + set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES $ENV{WATCOM}/lh) + endif() +endif() -- cgit v0.12 From 4adfd2a3aa328b42b87a75c7178c7e8214e8d3c6 Mon Sep 17 00:00:00 2001 From: Jiri Malak Date: Fri, 1 May 2020 16:14:33 +0200 Subject: OpenWatcom: Add cross-compilation support for Windows Add system header files directories for cross-compilation --- Modules/Platform/Windows-OpenWatcom.cmake | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Modules/Platform/Windows-OpenWatcom.cmake b/Modules/Platform/Windows-OpenWatcom.cmake index 4c0e57e..70055da 100644 --- a/Modules/Platform/Windows-OpenWatcom.cmake +++ b/Modules/Platform/Windows-OpenWatcom.cmake @@ -4,6 +4,8 @@ # This module is shared by multiple languages; use include blocker. include_guard() +set(CMAKE_BUILD_TYPE_INIT Debug) + set(CMAKE_CREATE_WIN32_EXE "system nt_win" ) set(CMAKE_CREATE_CONSOLE_EXE "system nt" ) string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " system nt_dll") @@ -14,10 +16,17 @@ set(CMAKE_SHARED_LIBRARY_C_FLAGS "-bd") # ... while this is a space separated st set(CMAKE_RC_COMPILER "rc" ) -set(CMAKE_BUILD_TYPE_INIT Debug) - # single/multi-threaded /-bm # static/DLL run-time libraries /-br # default is setup for multi-threaded + DLL run-time libraries string(APPEND CMAKE_C_FLAGS_INIT " -bt=nt -dWIN32 -br -bm") string(APPEND CMAKE_CXX_FLAGS_INIT " -bt=nt -xs -dWIN32 -br -bm") + +if(CMAKE_CROSSCOMPILING) + if(NOT CMAKE_C_STANDARD_INCLUDE_DIRECTORIES) + set(CMAKE_C_STANDARD_INCLUDE_DIRECTORIES $ENV{WATCOM}/h $ENV{WATCOM}/h/nt) + endif() + if(NOT CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES) + set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES $ENV{WATCOM}/h $ENV{WATCOM}/h/nt) + endif() +endif() -- cgit v0.12