Fix build

Signed-off-by: falkTX <falktx@falktx.com>
falkTX · Jun 5, 2023 · 0a977f2 · 0a977f2
1 parent e5f4667
commit 0a977f2
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -45,7 +45,7 @@ jobs:
         run: |
           source PawPaw/local.env macos-universal
           cmake -S . -B build
-          $(which cmake) --build build -j $(sysctl -n hw.logicalcpu)
+          cmake --build build -j $(sysctl -n hw.logicalcpu)
       - uses: actions/upload-artifact@v3
         with:
           name: macOS dmg
@@ -106,10 +106,13 @@ jobs:
         shell: bash
         run: |
           source PawPaw/local.env win32
-          alias
-          # cmake -S . -B build
-          cmake -DCMAKE_CROSSCOMPILING=ON -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_SYSTEM_PROCESSOR=i686 -DCMAKE_AR=/usr/bin/i686-w64-mingw32-ar -DCMAKE_C_COMPILER_AR=/usr/bin/i686-w64-mingw32-ar -DCMAKE_CXX_COMPILER_AR=/usr/bin/i686-w64-mingw32-ar -DCMAKE_RANLIB=/usr/bin/i686-w64-mingw32-ranlib -DCMAKE_C_COMPILER_RANLIB=/usr/bin/i686-w64-mingw32-ranlib -DCMAKE_CXX_COMPILER_RANLIB=/usr/bin/i686-w64-mingw32-ranlib -DCMAKE_CROSSCOMPILING_EMULATOR=wine -DCMAKE_RC_COMPILER=i686-w64-mingw32-windres -S . -B build
-          $(which cmake) --build build -j $(nproc)
+          cmake -DCMAKE_CROSSCOMPILING=ON -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_SYSTEM_PROCESSOR=i686 \
+                -DCMAKE_AR=/usr/bin/i686-w64-mingw32-ar -DCMAKE_C_COMPILER_AR=/usr/bin/i686-w64-mingw32-ar -DCMAKE_CXX_COMPILER_AR=/usr/bin/i686-w64-mingw32-ar \
+                -DCMAKE_RANLIB=/usr/bin/i686-w64-mingw32-ranlib -DCMAKE_C_COMPILER_RANLIB=/usr/bin/i686-w64-mingw32-ranlib -DCMAKE_CXX_COMPILER_RANLIB=/usr/bin/i686-w64-mingw32-ranlib \
+                -DCMAKE_CROSSCOMPILING_EMULATOR=wine \
+                -DCMAKE_RC_COMPILER=i686-w64-mingw32-windres \
+                -S . -B build
+          cmake --build build -j $(nproc)
       - name: Create zip package
         if: steps.cache.outputs.cache-hit == 'true'
         shell: bash
@@ -179,9 +182,13 @@ jobs:
         shell: bash
         run: |
           source PawPaw/local.env win64
-          alias
-          cmake -S . -B build
-          $(which cmake) --build build -j $(nproc)
+          cmake -DCMAKE_CROSSCOMPILING=ON -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_SYSTEM_PROCESSOR=x86_64 \
+                -DCMAKE_AR=/usr/bin/x86_64-w64-mingw32-ar -DCMAKE_C_COMPILER_AR=/usr/bin/x86_64-w64-mingw32-ar -DCMAKE_CXX_COMPILER_AR=/usr/bin/x86_64-w64-mingw32-ar \
+                -DCMAKE_RANLIB=/usr/bin/x86_64-w64-mingw32-ranlib -DCMAKE_C_COMPILER_RANLIB=/usr/bin/x86_64-w64-mingw32-ranlib -DCMAKE_CXX_COMPILER_RANLIB=/usr/bin/x86_64-w64-mingw32-ranlib \
+                -DCMAKE_CROSSCOMPILING_EMULATOR=wine \
+                -DCMAKE_RC_COMPILER=x86_64-w64-mingw32-windres \
+                -S . -B build
+          cmake --build build -j $(nproc)
       - name: Create zip package
         if: steps.cache.outputs.cache-hit == 'true'
         shell: bash

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,7 +20,7 @@ set_property(GLOBAL PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
 find_package(PkgConfig REQUIRED)
 find_package(Qt5 COMPONENTS REQUIRED Core Widgets)
 
-if(NOT (APPLE OR MINGW OR WIN32))
+if(NOT (APPLE OR WIN32))
   find_package(X11 REQUIRED)
   find_package(Qt5 COMPONENTS REQUIRED X11Extras)
 else()

diff --git a/chibiembedwidget.cpp b/chibiembedwidget.cpp
@@ -27,8 +27,8 @@ static int gErrorHandler(Display*, XErrorEvent*)
 struct ChibiEmbedWidget::PrivateData
 {
     QWidget* const widget;
-//     void* const ourWindowPtr;
     const uintptr_t ourWindowId;
+    void* const ourWindowPtr;
 
    #if defined(Q_OS_MAC)
     NSView* const view;
@@ -47,6 +47,7 @@ struct ChibiEmbedWidget::PrivateData
     PrivateData(QWidget* const w)
         : widget(w),
           ourWindowId(w->winId()),
+          ourWindowPtr((void*)ourWindowId),
          #if defined(Q_OS_MAC)
           view([[NSView new]retain]),
           subview(nullptr),
@@ -80,16 +81,17 @@ struct ChibiEmbedWidget::PrivateData
     {
         callback = cb;
         lookingForChildren = true;
+
        #if defined(Q_OS_MAC)
         subview = nullptr;
         return view;
        #elif defined(Q_OS_WINDOWS)
         pluginWindow = nullptr;
-        return ourWindowPtr;
        #else
         pluginWindow = 0;
-        return (void*)ourWindowId;
        #endif
+
+        return ourWindowPtr;
     }
 
     bool hide()
@@ -132,7 +134,7 @@ struct ChibiEmbedWidget::PrivateData
             }
            #elif defined(Q_OS_WINDOWS)
             if (pluginWindow == nullptr)
-                pluginWindow = FindWindowExA((::HWND)ourWindowPtr, nullptr, nullptr, nullptr);
+                pluginWindow = FindWindowExA((HWND)ourWindowPtr, nullptr, nullptr, nullptr);
            #else
             if (pluginWindow == 0)
             {