Build kauai and chomp on Linux, allowing release .chk files identical to those on Windows to be built

cmake/TargetChompSources.cmake

@@ -12,11 +12,14 @@ function(target_chomp_sources target)
 
   set(is-msvc 0)
   set(is-clangcl 0)
+  set(is-gcc 0)
   if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
     set(is-msvc 1)
   elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" AND "${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}" STREQUAL "MSVC")
     set(is-msvc 1)
     set(is-clangcl 1)
+  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    set(is-gcc 1)
   endif()
 
   set(external-chomp 0)
@@ -56,6 +59,9 @@ function(target_chomp_sources target)
         "$<${is-msvc}:/E>"
         "$<${is-msvc}:/TP>"
         "$<${is-clangcl}:/clang:-fuse-line-directives>"
+        "$<${is-gcc}:-E>"
+        "$<${is-gcc}:-x>"
+        "$<${is-gcc}:c>"
         "${include-directories}"
         "${compile-definitions}"
         "${source}" > "${processed}"
@@ -78,4 +84,4 @@ function(target_chomp_sources target)
   add_custom_target(${target}-chomp-chunks
     DEPENDS $<TARGET_PROPERTY:${target},CHOMPED_CHUNKS>)
   add_dependencies(${target} ${target}-chomp-chunks)
-endfunction()
+endfunction()

kauai/CMakeLists.txt

@@ -138,6 +138,10 @@ add_library(KauaiFile
     # Windows implementations
     $<$<PLATFORM_ID:Windows>:${PROJECT_SOURCE_DIR}/kauai/src/filewin.cpp>
     $<$<PLATFORM_ID:Windows>:${PROJECT_SOURCE_DIR}/kauai/src/fniwin.cpp>
+
+    # Linux implementations
+    $<$<PLATFORM_ID:Linux>:${PROJECT_SOURCE_DIR}/kauai/src/fileposix.cpp>
+    $<$<PLATFORM_ID:Linux>:${PROJECT_SOURCE_DIR}/kauai/src/fniposix.cpp>
 )
 if (ENABLE_ASM_X86)
     target_sources(
@@ -307,6 +311,7 @@ endif()
 add_library(KauaiPic
     "${PROJECT_SOURCE_DIR}/kauai/src/pic.cpp"
     $<$<PLATFORM_ID:Windows>:${PROJECT_SOURCE_DIR}/kauai/src/picwin.cpp>
+    $<$<NOT:$<PLATFORM_ID:Windows>>:${PROJECT_SOURCE_DIR}/kauai/src/picstub.cpp>
 )
 target_link_libraries(
     KauaiPic
@@ -485,17 +490,15 @@ elseif(3DMM_GUI STREQUAL "SDL")
     # SDL dialogs are implemented in the studio project
 endif()
 
-# Ctl: Control support (Win32 only)
-if (3DMM_GUI STREQUAL "Win32")
-    add_library(KauaiCtl
-        "${PROJECT_SOURCE_DIR}/kauai/src/ctl.cpp"
-    )
-    target_link_libraries(
-        KauaiCtl
-        PUBLIC
-        KauaiGui
-    )
-endif()
+# Ctl: Control support
+add_library(KauaiCtl
+    "${PROJECT_SOURCE_DIR}/kauai/src/ctl.cpp"
+)
+target_link_libraries(
+    KauaiCtl
+    PUBLIC
+    KauaiGui
+)
 
 # Doc: Base document class support
 add_library(KauaiDoc
@@ -508,13 +511,11 @@ target_link_libraries(
     KauaiGui
 )
 
-if (3DMM_GUI STREQUAL "Win32")
-    target_link_libraries(
-        KauaiDoc
-        PRIVATE
-        KauaiCtl
-    )
-endif()
+target_link_libraries(
+    KauaiDoc
+    PRIVATE
+    KauaiCtl
+)
 
 # RichText: Rich text document support
 add_library(KauaiRichText
@@ -669,6 +670,7 @@ target_sources(khello
 target_link_libraries(
     khello
     PRIVATE
+    KauaiBase
     KauaiGui
     KauaiGuiMain
     KauaiDoc # TODO: should this be a dependency of KauaiGui?

kauai/src/appb.cpp

@@ -197,7 +197,11 @@ int32_t APPB::OnnDefVariable(void)
     {
         STN stn;
 
-        stn = MacWin(PszLit("New York"), PszLit("Times New Roman"));
+#ifdef MAC
+        stn = PszLit("New York");
+#else
+        stn = PszLit("Times New Roman");
+#endif
         if (!vntl.FGetOnn(&stn, &_onnDefVariable))
             _onnDefVariable = vntl.OnnSystem();
     }
@@ -215,7 +219,11 @@ int32_t APPB::OnnDefFixed(void)
     {
         STN stn;
 
-        stn = MacWin(PszLit("Courier"), PszLit("Courier New"));
+#ifdef MAC
+        stn = PszLit("Courier");
+#else
+        stn = PszLit("Courier New");
+#endif
         if (!vntl.FGetOnn(&stn, &_onnDefFixed))
         {
             // just use the first fixed pitch font
@@ -1664,8 +1672,15 @@ void APPB::WarnProcApp(PSZS pszsFile, int32_t lwLine, PSZS pszsMsg)
     stnFile.SetSzs(pszsFile);
     stnMsg.SetSzs(pszsMsg);
 
-    stn.FFormatSz(PszLit("%s(%d): %s\xD") Win(PszLit("\xA")), &stnFile, lwLine, &stnMsg);
-    Win(OutputDebugString(stn.Psz());) _pfilWarn->FWriteRgbSeq(stn.Prgch(), stn.Cch(), &_fpCur);
+#ifdef WIN
+    stn.FFormatSz(PszLit("%s(%d): %s\xD\xA"), &stnFile, lwLine, &stnMsg);
+    OutputDebugString(stn.Psz());
+#elif defined(MAC)
+    stn.FFormatSz(PszLit("%s(%d): %s\xD"), &stnFile, lwLine, &stnMsg);
+#else
+    stn.FFormatSz(PszLit("%s(%d): %s\xA"), &stnFile, lwLine, &stnMsg);
+#endif
+    _pfilWarn->FWriteRgbSeq(stn.Prgch(), stn.Cch(), &_fpCur);
 
 LDone:
     _fInWarn = fFalse;

kauai/src/appb.h

@@ -221,7 +221,7 @@ class APPB : public APPB_PAR
     // setting up the heap
     static void _SetupHeap(int32_t cbExtraStack, int32_t cactMoreMasters);
     virtual void SetupHeap(void);
-#elif defined(WIN)
+#else
     static void CreateConsole();
 #endif
 

kauai/src/appbsdl.cpp

@@ -46,11 +46,11 @@ void APPB::CreateConsole()
     freopen_s(&fDummy, "CONOUT$", "w", stdout);
     freopen_s(&fDummy, "CONOUT$", "w", stderr);
     freopen_s(&fDummy, "CONIN$", "r", stdin);
+#endif // WIN32
     std::cout.clear();
     std::clog.clear();
     std::cerr.clear();
     std::cin.clear();
-#endif // WIN32
 }
 
 /***************************************************************************
@@ -251,6 +251,7 @@ void APPB::_DispatchEvt(PEVT pevt)
         ResetToolTip();
         break;
     case SDL_SYSWMEVENT:
+#ifdef WIN
         if (pevt->syswm.msg->msg.win.msg == WM_COMMAND)
         {
             int32_t lwT = pevt->syswm.msg->msg.win.wParam;
@@ -263,6 +264,7 @@ void APPB::_DispatchEvt(PEVT pevt)
             else if (pvNil != vpcex)
                 vpcex->EnqueueCid(lwT);
         }
+#endif
         break;
     case SDL_MOUSEBUTTONDOWN:
         ResetToolTip();

kauai/src/chcm.cpp

@@ -2344,7 +2344,7 @@ bool CHLX::FGetPath(FNI *pfni)
         stn.FAppendCh(ch);
     }
 
-#ifdef WIN
+#ifndef MAC
     if (pfni->FSearchInPath(&stn, _pszSearchPath))
     {
         return fTrue;

kauai/src/clip.cpp

@@ -304,9 +304,9 @@ bool CLIP::FInitExport(void)
         return fFalse;
     }
 
+#ifdef WIN
     _hnExport = hNil;
 
-#ifdef WIN
     if (!OpenClipboard(vwig.hwndApp))
         return fFalse;
     if (!EmptyClipboard())

kauai/src/ctl.cpp

@@ -98,6 +98,7 @@ PCTL CTL::PctlFromHctl(HCTL hctl)
 ***************************************************************************/
 void CTL::_NewRc(void)
 {
+#ifdef WIN
     RC rc;
     RECT rcs;
     HWND hwnd;
@@ -108,6 +109,7 @@ void CTL::_NewRc(void)
     hwnd = _HwndGetRc(&rc);
     Assert(hwnd != hNil, "control isn't based in an hwnd");
     rcs = RCS(rc);
+#endif
 #ifdef MAC
     RCS rcsOld = (*_hctl)->contrlRect;
 
@@ -203,10 +205,9 @@ int32_t SCB::DxpNormal(void)
     if (_dxp > 0)
         return _dxp;
     return (_dxp = GetSystemMetrics(SM_CXVSCROLL));
-#endif // WIN
-#ifdef MAC
+#else // WIN
     return 16;
-#endif // MAC
+#endif
 }
 
 /***************************************************************************
@@ -220,10 +221,9 @@ int32_t SCB::DypNormal(void)
     if (_dyp > 0)
         return _dyp;
     return (_dyp = GetSystemMetrics(SM_CYHSCROLL));
-#endif // WIN
-#ifdef MAC
+#else // WIN
     return 16;
-#endif // MAC
+#endif
 }
 
 /***************************************************************************
@@ -273,6 +273,8 @@ void SCB::GetClientRc(uint32_t grfscb, RC *prcAbs, RC *prcRel)
 bool SCB::_FCreate(int32_t val, int32_t valMin, int32_t valMax, uint32_t grfscb)
 {
     Assert(_Hctl() == hNil, "scb already created");
+    bool redraw = fFalse;
+#ifdef WIN
     RC rc;
     HWND hwnd;
     HCTL hctl;
@@ -283,7 +285,7 @@ bool SCB::_FCreate(int32_t val, int32_t valMin, int32_t valMax, uint32_t grfscb)
         Bug("can only add controls to hwnd based gobs");
         return fFalse;
     }
-
+#endif
 #ifdef MAC
     GNV gnv(this);
     gnv.Set();
@@ -292,6 +294,7 @@ bool SCB::_FCreate(int32_t val, int32_t valMin, int32_t valMax, uint32_t grfscb)
     if (hctl == hNil || !_FSetHctl(hctl))
         return fFalse;
     ValidRc(pvNil);
+    redraw = true;
 #endif // MAC
 #ifdef WIN
     RECT rcs(rc);
@@ -303,7 +306,7 @@ bool SCB::_FCreate(int32_t val, int32_t valMin, int32_t valMax, uint32_t grfscb)
     SetScrollPos(hctl, SB_CTL, 0, fFalse);
 #endif // WIN
 
-    SetValMinMax(val, valMin, valMax, MacWin(fTrue, fFalse));
+    SetValMinMax(val, valMin, valMax, redraw);
     return fTrue;
 }
 

kauai/src/docb.cpp

@@ -369,10 +369,17 @@ bool DOCB::FSaveToFni(FNI *pfni, bool fSetFni)
 ***************************************************************************/
 bool DOCB::FGetFniSave(FNI *pfni)
 {
+#ifdef WIN
     return FGetFniSaveMacro(pfni, 'TEXT',
                             "\x9"
                             "Save As: ",
                             "", PszLit("All files\0*.*\0"), vwig.hwndApp);
+#else
+    return FGetFniSaveMacro(pfni, 'TEXT',
+                            "\x9"
+                            "Save As: ",
+                            "", PszLit("All files\0*.*\0"), nullptr);
+#endif
 }
 
 /***************************************************************************
@@ -1347,7 +1354,7 @@ void DDG::MarkMem(void)
 }
 #endif // DEBUG
 
-#if defined(KAUAI_WIN32)
+#ifndef MAC
 
 /***************************************************************************
     Static method: create a new Document MDI window.  Put a size box in
@@ -2476,4 +2483,4 @@ tribool DSSM::TVert(void)
     return pdmw->TVert(pdsg);
 }
 
-#endif // KAUAI_WIN32
+#endif // !MAC

kauai/src/file.h

@@ -81,6 +81,8 @@ class FIL : public FIL_PAR
     int16_t _fref;
 #elif defined(WIN)
     HANDLE _hfile;
+#else
+    FILE *_fp;
 #endif // WIN
 
     // private methods