diff options
| author | Wohlstand <admin@wohlnet.ru> | 2020-09-03 21:30:21 +0300 |
|---|---|---|
| committer | Wohlstand <admin@wohlnet.ru> | 2020-09-03 21:30:21 +0300 |
| commit | e81db845bf4c8b78310fd8c8807f490cb094a0ec (patch) | |
| tree | 4b854d708773d3b0818781d09157d07dee2415be /cmake | |
| parent | 94f30af1cca58faea337d0e50fc21a852c5bb2b7 (diff) | |
| download | libADLMIDI-e81db845bf4c8b78310fd8c8807f490cb094a0ec.tar.gz libADLMIDI-e81db845bf4c8b78310fd8c8807f490cb094a0ec.tar.bz2 libADLMIDI-e81db845bf4c8b78310fd8c8807f490cb094a0ec.zip | |
Tweak OpenWatcom flags and scripts
Unfortunately, thing is now unbuildable under OW because of missing std::nothrew and template-of-template
Diffstat (limited to 'cmake')
| -rwxr-xr-x | cmake/openwattcom-dos/ow-cmake.sh | 8 | ||||
| -rw-r--r-- | cmake/openwattcom-dos/toolchain-ow.cmake | 12 | ||||
| -rwxr-xr-x | cmake/openwattcom/ow-cmake.sh | 2 |
3 files changed, 15 insertions, 7 deletions
diff --git a/cmake/openwattcom-dos/ow-cmake.sh b/cmake/openwattcom-dos/ow-cmake.sh index 60ebf6e..2afcc6e 100755 --- a/cmake/openwattcom-dos/ow-cmake.sh +++ b/cmake/openwattcom-dos/ow-cmake.sh @@ -1,11 +1,11 @@ #!/bin/bash -export WATCOM=$HOME/Qt/Tools/ow-snapshot-2.0 +export WATCOM=/opt/watcom export EDPATH=$WATCOM/eddat export WIPFC=$WATCOM/wipfc export INCLUDE="$WATCOM/h" -WATCOM_FLAGS="-bdos4g -march=i386" -export CFLAGS="$WATCOM_FLAGS -xc -std=wc" -export CXXFLAGS="$WATCOM_FLAGS -xc++ -xs -feh -frtti -std=c++98" +#WATCOM_FLAGS="-bdos4g -march=i386" +#export CFLAGS="$WATCOM_FLAGS -x c -std=wc" +#export CXXFLAGS="$WATCOM_FLAGS -x c++ -xs -feh -frtti -std=c++98" export LFLAGS="$WATCOM_FLAGS" SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" diff --git a/cmake/openwattcom-dos/toolchain-ow.cmake b/cmake/openwattcom-dos/toolchain-ow.cmake index cff87e8..0adece2 100644 --- a/cmake/openwattcom-dos/toolchain-ow.cmake +++ b/cmake/openwattcom-dos/toolchain-ow.cmake @@ -5,7 +5,9 @@ SET(CMAKE_SYSTEM_VERSION 6) set (OPENWATTCOM TRUE) set (MSDOS TRUE) -set (WATCOM_PREFIX "$ENV{HOME}/Qt/Tools/ow-snapshot-2.0") +set (WATCOM_PREFIX "/opt/watcom") + +#add_definitions(-D__WATCOMC__ -D__DOS__ -D__DOS4G__) set (ENV{PATH} ${WATCOM_PREFIX}/binl:$ENV{PATH}) set (ENV{WATCOM} ${WATCOM_PREFIX}) @@ -17,6 +19,13 @@ set (ENV{WIPFC} ${WATCOM_PREFIX}/wipfc) set (CMAKE_C_COMPILER ${WATCOM_PREFIX}/binl/owcc) set (CMAKE_CXX_COMPILER ${WATCOM_PREFIX}/binl/owcc) +set (WATCOM_FLAGS "-bdos4g -march=i386") +set (CMAKE_C_FLAGS "${WATCOM_FLAGS} -x c -std=wc") +set (CMAKE_CXX_FLAGS "${WATCOM_FLAGS} -xc++ -xs -feh -frtti -std=c++98") +set (CMAKE_EXE_LINKER_FLAGS "") +# export CFLAGS="$WATCOM_FLAGS -x c -std=wc" +# export CXXFLAGS="$WATCOM_FLAGS -x c++ -xs -feh -frtti -std=c++98" + # where is the target environment set (CMAKE_FIND_ROOT_PATH ${WATCOM_PREFIX}) @@ -40,4 +49,3 @@ set (QT_INCLUDE_DIRS_NO_SYSTEM ON) # include(Linux-OpenWatcom.cmake) - diff --git a/cmake/openwattcom/ow-cmake.sh b/cmake/openwattcom/ow-cmake.sh index 00d048d..843cda7 100755 --- a/cmake/openwattcom/ow-cmake.sh +++ b/cmake/openwattcom/ow-cmake.sh @@ -1,5 +1,5 @@ #!/bin/bash -export WATCOM=$HOME/Qt/Tools/ow-snapshot-2.0 +export WATCOM=/opt/watcom export EDPATH=$WATCOM/eddat export WIPFC=$WATCOM/wipfc export INCLUDE="$WATCOM/lh" |