Merge pull request #13 from mcayland/feature/linux-platform-part4

Fix kauai tests, followed by various fixes for Linux to enable 3dmovie to build and launch

Author: benstone

.github/workflows/build.yml

@@ -151,3 +151,38 @@ jobs:
           name: 3DMMEx Windows x64
           path: |
             dist/x64-clangcl-relwithdebinfo
+
+  compile-gcc-x86_64-linux-release:
+    name: Linux gcc x86_64 Debug
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install Packages
+        run: |
+          sudo apt-get update &&
+          sudo apt-get install -y g++ cmake libsdl2-dev libsdl2-ttf-dev libgtk-3-dev zenity ninja-build
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: CMake Generate
+        run: |
+          cmake --preset sdl-x86_64-gcc-linux-debug
+      - name: CMake Build
+        run: |
+          cmake --build build/sdl-x86_64-gcc-linux-debug --target tools studio tests
+      - name: Run tests
+        run: |
+          ctest --test-dir build/sdl-x86_64-gcc-linux-debug --output-on-failure --timeout 60
+      - name: CMake Install
+        run: |
+          cmake --install build/sdl-x86_64-gcc-linux-debug --prefix dist/sdl-x86_64-gcc-linux-debug
+      - name: Upload debug files
+        uses: actions/upload-artifact@v4
+        with:
+          name: 3DMMEx Linux gcc x86_64 debug files
+          path: |
+            build/sdl-x86_64-gcc-linux-debug/src/chomp/studio/*.i
+      - name: Upload Debug
+        uses: actions/upload-artifact@v4
+        with:
+          name: 3DMMEx Linux gcc x86_64 Debug
+          path: |
+            dist/sdl-x86_64-gcc-linux-debug

CMakePresets.json

@@ -184,6 +184,24 @@
                 "CMAKE_BUILD_TYPE": "Debug",
                 "3DMM_GUI": "SDL"
             }
+        },
+        {
+            "displayName": "SDL Linux gcc x64_64 Debug",
+            "name": "sdl-x86_64-gcc-linux-debug",
+            "inherits": "base",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug",
+                "3DMM_GUI": "SDL"
+            }
+        },
+        {
+            "displayName": "SDL Linux gcc x64_64 Release",
+            "name": "sdl-x86_64-gcc-linux-release",
+            "inherits": "base",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release",
+                "3DMM_GUI": "SDL"
+            }
         }
     ]
-}
+}

bren/stdmem.c bren/stdmemwin.cbren/stdmem.c renamed to bren/stdmemwin.c

@@ -158,7 +158,7 @@ bool TMAP::FWrite(PBLCK pblck)
     return fTrue;
 }
 
-#ifdef WIN
+#ifndef MAC
 
 #define CALCDIST(bRed1, bGreen1, bBlue1, bRed2, bGreen2, bBlue2)                                                       \
     (((bRed1) - (bRed2)) * ((bRed1) - (bRed2)) + ((bGreen1) - (bGreen2)) * ((bGreen1) - (bGreen2)) +                   \
@@ -255,7 +255,7 @@ PTMAP TMAP::PtmapReadNative(FNI *pfni, PGL pglclr)
                         pglCache->Put(prgb[iprgb], &iclrBest);
                     }
 
-                    prgb[iprgb] = (BYTE)iclrBest;
+                    prgb[iprgb] = (uint8_t)iclrBest;
                 }
             }
 
@@ -269,9 +269,7 @@ PTMAP TMAP::PtmapReadNative(FNI *pfni, PGL pglclr)
 
     return ptmap;
 }
-#endif // WIN
-
-#ifdef MAC
+#else  // !MAC
 PTMAP TMAP::PtmapReadNative(FNI *pfni)
 {
     RawRtn(); // REVIEW peted: NYI

bren/tmap.cpp

@@ -93,11 +93,19 @@
 #define khidMsqClock khidLimKidFrame + 4
 // khidStudio 				khidLimKidFrame + 5  Defined in stdiodef.h
 
-#define kftgChunky MacWin(KLCONST4('c', 'h', 'n', 'k'), KLCONST3('c', 'h', 'k'))
-#define kftgContent MacWin(KLCONST4('3', 'c', 'o', 'n'), KLCONST3('3', 'c', 'n'))
-#define kftgThumbDesc MacWin(KLCONST4('3', 't', 'h', 'd'), KLCONST3('3', 't', 'h'))
-#define kftg3mm MacWin(KLCONST3('3', 'm', 'm'), KLCONST3('3', 'm', 'm'))
-#define kftgSocTemp MacWin(KLCONST4('3', 't', 'm', 'p'), KLCONST3('3', 't', 'p'))
+#ifdef MAC
+#define kftgChunky KLCONST4('c', 'h', 'n', 'k')
+#define kftgContent KLCONST4('3', 'c', 'o', 'n')
+#define kftgThumbDesc KLCONST4('3', 't', 'h', 'd')
+#define kftg3mm KLCONST3('3', 'm', 'm')
+#define kftgSocTemp KLCONST4('3', 't', 'm', 'p')
+#else
+#define kftgChunky KLCONST3('c', 'h', 'k')
+#define kftgContent KLCONST3('3', 'c', 'n')
+#define kftgThumbDesc KLCONST3('3', 't', 'h')
+#define kftg3mm KLCONST3('3', 'm', 'm')
+#define kftgSocTemp KLCONST3('3', 't', 'p')
+#endif
 
 #define ksz3mm PszLit("3mm")
 

inc/soc.h

@@ -213,7 +213,7 @@ class APP : public APP_PAR
     bool _FInitBuilding(void);
     bool _FInitStudio(PFNI pfniUserDoc, bool fFailIfDocOpenFailed = fTrue);
     bool _FInitAcceleratorTable(void);
-    void _GetWindowProps(int32_t *pxp, int32_t *pyp, int32_t *pdxp, int32_t *pdyp, DWORD *pdwStyle);
+    void _GetWindowProps(int32_t *pxp, int32_t *pyp, int32_t *pdxp, int32_t *pdyp, uint32_t *pdwStyle);
     void _RebuildMainWindow(void);
     bool _FSwitch640480(bool fTo640480);
     bool _FDisplayIs640480(void);

inc/utest.h

@@ -617,7 +617,10 @@ if (BUILD_TESTS)
     target_link_libraries(
         KauaiGuiTest
         PUBLIC
+        KauaiBase
+        KauaiFile
         KauaiTestLib
+        KauaiGroup
         KauaiGui
         KauaiRichText
         GTest::gtest_main

kauai/CMakeLists.txt

@@ -10,7 +10,6 @@
 #include "frame.h"
 #include "fcntl.h"
 #include "stdio.h"
-#include "io.h"
 
 ASSERTNAME
 
@@ -837,4 +836,4 @@ int32_t APPB::Win32VkFromVk(int32_t vk)
     }
 
     return vk;
-}
+}

kauai/src/appbsdl.cpp

@@ -127,6 +127,7 @@ class FNI : public FNI_PAR
 
     tribool TExists(void);
     bool FDelete(void);
+    bool FIsReadOnly(void);
     bool FRename(PFNI pfniNew);
     bool FEqual(PFNI pfni);
 

kauai/src/fni.h

@@ -429,17 +429,28 @@ bool FNI::FDelete(void)
     return fFalse;
 }
 
+/***************************************************************************
+    Return whether the fni is read-only.
+***************************************************************************/
+bool FNI::FIsReadOnly(void)
+{
+    AssertThis(ffniFile);
+    fs::perms perms;
+
+    perms = fs::status(_stnFile.Psz()).permissions();
+
+    return ((perms & fs::perms::owner_write) == fs::perms::none);
+}
+
 /***************************************************************************
     Renames the file indicated by this to *pfni.
 ***************************************************************************/
 bool FNI::FRename(FNI *pfni)
 {
     AssertThis(ffniFile);
     AssertPo(pfni, ffniFile);
-    fs::perms perms;
 
-    perms = fs::status(_stnFile.Psz()).permissions();
-    if (!((perms & fs::perms::owner_write) == fs::perms::none))
+    if (!FIsReadOnly())
     {
         fs::path src = fs::path(_stnFile.Psz());
         fs::path dst = fs::path(pfni->_stnFile.Psz());