diff options
| author | Jiri Malak <malak.jiri@gmail.com> | 2023-01-24 21:36:24 (GMT) |
|---|---|---|
| committer | Jiri Malak <malak.jiri@gmail.com> | 2023-01-25 16:53:03 (GMT) |
| commit | e194caa5a3c35be8b9322304e87b9a38239d65ea (patch) | |
| tree | 9c2ae6f179704b09c3be7e49d7c0675e1ee11be0 /Modules/Platform/Windows-OpenWatcom.cmake | |
| parent | 950effe434623b50a1c85e2c53ed592210e79ceb (diff) | |
| download | CMake-e194caa5a3c35be8b9322304e87b9a38239d65ea.zip CMake-e194caa5a3c35be8b9322304e87b9a38239d65ea.tar.gz CMake-e194caa5a3c35be8b9322304e87b9a38239d65ea.tar.bz2 | |
OpenWatcom: Add correct support for 16-bit Windows
This add correct Open Watcom support for 16-bit Windows 3.x.
It replace existing strange mixture with WIN32 stuff which implement 16-bit Windows target partially as part of WIN32 stuff.
Now pre-defined OS ID Windows3x is used instead of confusing WIN32.
It support properly 16-bit and 32-bit application for 16-bit Windows host.
32-bit applications are build with OW WIN386 extender.
It is used similar as for other platforms by set CMAKE_SYSTEM_NAME=Windows3x and CMAKE_SYSTEM_PROCESSOR=I86 for 16-bit application or CMAKE_SYSTEM_PROCESSOR=x86 for 32-bit WIN386 extender application running on 16-bit Windows 3.x.
CMAKE_SYSTEM_NAME=Windows is used only for WIN32 applications.
Diffstat (limited to 'Modules/Platform/Windows-OpenWatcom.cmake')
| -rw-r--r-- | Modules/Platform/Windows-OpenWatcom.cmake | 45 |
1 files changed, 12 insertions, 33 deletions
diff --git a/Modules/Platform/Windows-OpenWatcom.cmake b/Modules/Platform/Windows-OpenWatcom.cmake index aba84cb..3e9795e 100644 --- a/Modules/Platform/Windows-OpenWatcom.cmake +++ b/Modules/Platform/Windows-OpenWatcom.cmake @@ -6,13 +6,8 @@ include_guard() set(CMAKE_BUILD_TYPE_INIT Debug) -if(DEFINED CMAKE_SYSTEM_PROCESSOR AND CMAKE_SYSTEM_PROCESSOR STREQUAL "I86") - string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " system windows") - string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT " system windows") -else() - string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " system nt_dll") - string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT " system nt_dll") -endif() +string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " system nt_dll") +string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT " system nt_dll") 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. @@ -28,39 +23,23 @@ else() set(_br_bm "-br -bm") endif() -if(DEFINED CMAKE_SYSTEM_PROCESSOR AND CMAKE_SYSTEM_PROCESSOR STREQUAL "I86") - string(APPEND CMAKE_C_FLAGS_INIT " -bt=windows ") - string(APPEND CMAKE_CXX_FLAGS_INIT " -bt=windows ") -else() - string(APPEND CMAKE_C_FLAGS_INIT " -bt=nt -dWIN32 ${_br_bm}") - string(APPEND CMAKE_CXX_FLAGS_INIT " -bt=nt -xs -dWIN32 ${_br_bm}") -endif() +string(APPEND CMAKE_C_FLAGS_INIT " -bt=nt -dWIN32 ${_br_bm}") +string(APPEND CMAKE_CXX_FLAGS_INIT " -bt=nt -xs -dWIN32 ${_br_bm}") unset(__WINDOWS_WATCOM_CMP0136) unset(_br_bm) macro(__windows_open_watcom lang) - if(DEFINED CMAKE_SYSTEM_PROCESSOR AND CMAKE_SYSTEM_PROCESSOR STREQUAL "I86") - if(NOT CMAKE_${lang}_STANDARD_INCLUDE_DIRECTORIES) - set(CMAKE_${lang}_STANDARD_INCLUDE_DIRECTORIES $ENV{WATCOM}/h $ENV{WATCOM}/h/win) - endif() - set(CMAKE_${lang}_CREATE_WIN32_EXE "system windows") - set(CMAKE_${lang}_CREATE_CONSOLE_EXE "system windows") - - set(CMAKE_${lang}_COMPILE_OPTIONS_WATCOM_RUNTIME_LIBRARY_SingleThreaded "") - set(CMAKE_${lang}_COMPILE_OPTIONS_WATCOM_RUNTIME_LIBRARY_SingleThreadedDLL "") - set(CMAKE_${lang}_COMPILE_OPTIONS_WATCOM_RUNTIME_LIBRARY_MultiThreaded "") - set(CMAKE_${lang}_COMPILE_OPTIONS_WATCOM_RUNTIME_LIBRARY_MultiThreadedDLL "") - else() + if(CMAKE_CROSSCOMPILING) if(NOT CMAKE_${lang}_STANDARD_INCLUDE_DIRECTORIES) set(CMAKE_${lang}_STANDARD_INCLUDE_DIRECTORIES $ENV{WATCOM}/h $ENV{WATCOM}/h/nt) endif() - set(CMAKE_${lang}_CREATE_WIN32_EXE "system nt_win") - set(CMAKE_${lang}_CREATE_CONSOLE_EXE "system nt") - - set(CMAKE_${lang}_COMPILE_OPTIONS_WATCOM_RUNTIME_LIBRARY_SingleThreaded "") - set(CMAKE_${lang}_COMPILE_OPTIONS_WATCOM_RUNTIME_LIBRARY_SingleThreadedDLL -br) - set(CMAKE_${lang}_COMPILE_OPTIONS_WATCOM_RUNTIME_LIBRARY_MultiThreaded -bm) - set(CMAKE_${lang}_COMPILE_OPTIONS_WATCOM_RUNTIME_LIBRARY_MultiThreadedDLL -bm -br) endif() + set(CMAKE_${lang}_CREATE_WIN32_EXE "system nt_win") + set(CMAKE_${lang}_CREATE_CONSOLE_EXE "system nt") + + set(CMAKE_${lang}_COMPILE_OPTIONS_WATCOM_RUNTIME_LIBRARY_SingleThreaded "") + set(CMAKE_${lang}_COMPILE_OPTIONS_WATCOM_RUNTIME_LIBRARY_SingleThreadedDLL -br) + set(CMAKE_${lang}_COMPILE_OPTIONS_WATCOM_RUNTIME_LIBRARY_MultiThreaded -bm) + set(CMAKE_${lang}_COMPILE_OPTIONS_WATCOM_RUNTIME_LIBRARY_MultiThreadedDLL -bm -br) endmacro() |