Ci Runners for Windows & Mac

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Setup cmake
-      uses: jwlawson/actions-setup-cmake@v1.12
+      uses: jwlawson/actions-setup-cmake@v2
       with:
         cmake-version: '3.24.x'
     - name: Test cmake version
@@ -53,3 +53,94 @@ jobs:
         path: |
           build_linux/lk_sandbox*
           build_linux/lk*.a
+
+  build-on-windows:
+    runs-on: windows-latest
+    steps:
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v2
+
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Download wxWidgets
+      shell: bash
+      run: |
+        curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxMSW-3.2.3_vc14x_x64_Dev.7z -o wxMSW-3.2.3_vc14x_x64_Dev.7z
+        mkdir wxMSW-3.2.3_vc14x_x64_Dev
+        7z x wxMSW-3.2.3_vc14x_x64_Dev.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_x64_Dev
+        curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxMSW-3.2.3_vc14x_x64_ReleaseDLL.7z -o wxMSW-3.2.3_vc14x_x64_ReleaseDLL.7z
+        7z x wxMSW-3.2.3_vc14x_x64_ReleaseDLL.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_x64_ReleaseDLL
+        cp wxMSW-3.2.3_vc14x_x64_ReleaseDLL/lib/vc14x_x64_dll/* wxMSW-3.2.3_vc14x_x64_Dev/lib/vc14x_x64_dll
+        curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3-headers.7z -o wxWidgets-3.2.3-headers.7z
+        7z x wxWidgets-3.2.3-headers.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_x64_Dev
+        WXMSW3=$GITHUB_WORKSPACE\\wxMSW-3.2.3_vc14x_x64_Dev
+        echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV
+        WXWIN=$GITHUB_WORKSPACE\\wxMSW-3.2.3_vc14x_x64_Dev
+        echo "WXWIN=$WXWIN" >> $GITHUB_ENV
+
+    - name: Setup cmake
+      uses: jwlawson/actions-setup-cmake@v2
+      with:
+        cmake-version: '3.24.x'
+
+    - name: Build LK
+      run: |
+        mkdir build
+        cd build
+        cmake -G "Visual Studio 17 2022" -DCMAKE_CONFIGURATION_TYPES="Release" -DCMAKE_SYSTEM_VERSION=10.0 ..
+        MSBuild.exe .\lk.sln /t:Build /p:Configuration=Release
+
+    - name: Save static lib & lksandbox
+      uses: actions/upload-artifact@v2
+      with:
+        name: LK-${{ env.RUNS_ON }}-x86_64
+        path: |
+          build/Release/lk_sandbox*
+          build/Release/lk*.a
+
+  build-on-mac:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-14-large, macos-latest]
+    steps:
+    - name: Install wxWidgets
+      if: ${{ matrix.os == 'macos-14-large'}}
+      run: |
+        brew install wxmac
+        /usr/local/Cellar/wxwidgets/3.2.5/bin/wx-config --cflags
+        WXMSW3=/usr/local/Cellar/wxwidgets/3.2.5
+        echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV
+        echo /usr/local/Cellar/wxwidgets/3.2.5/bin >> $GITHUB_PATH
+
+    - name: Install wxWidgets
+      if: ${{ matrix.os == 'macos-latest'}}
+      run: |
+        brew install wxmac
+        /opt/homebrew/Cellar/wxwidgets/3.2.4/bin/wx-config --cflags
+        WXMSW3=/opt/homebrew/Cellar/wxwidgets/3.2.4
+        echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV
+        echo /opt/homebrew/Cellar/wxwidgets/3.2.4/bin >> $GITHUB_PATH
+
+    - name: Setup cmake
+      uses: jwlawson/actions-setup-cmake@v2
+      with:
+        cmake-version: '3.24.x'
+
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Build LK
+      run: |
+        cmake -Bbuild -DCMAKE_BUILD_TYPE=Release
+        cmake --build build -- -j -j 4
+
+    - name: Save static lib & lksandbox
+      uses: actions/upload-artifact@v2
+      with:
+        name: LK-${{ env.RUNS_ON }}-x86_64
+        path: |
+          build/lk_sandbox*
+          build/lk*.a
+

CMakeLists.txt

@@ -82,19 +82,21 @@ endif (MSVC)
 if (UNIX)
     if(EXISTS /usr/local/bin/wx-config-3)
         set(wxWidgets_CONFIG_EXECUTABLE /usr/local/bin/wx-config-3)
-        find_package(wxWidgets REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base)
     else ()
         set(wxWidgets_CONFIG_EXECUTABLE $ENV{WXMSW3}/bin/wx-config)
-        find_package(wxWidgets REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base)
     endif ()
+    find_package(wxWidgets REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base)
+    include(${wxWidgets_USE_FILE})
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS}")
 else ()
-    set(wxWidgets_ROOT_DIR $ENV{WXMSW3})
-    find_package(wxWidgets REQUIRED qa webview aui richtext html propgrid adv net stc core base scintilla)
+    if(NOT EXISTS "$ENV{WXMSW3}/wxwidgets.props")
+        set(wxWidgets_ROOT_DIR $ENV{WXMSW3})
+        find_package(wxWidgets REQUIRED qa webview aui richtext html propgrid adv net stc core base scintilla)
+        include(${wxWidgets_USE_FILE})
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS}")
+    endif()
 endif ()
 
-include(${wxWidgets_USE_FILE})
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS}")
-
 
 #####################################################################################################################
 #
@@ -151,5 +153,21 @@ if (NOT SAM_SKIP_TOOLS)
         target_link_libraries(lk_sandbox -ldl)
     endif ()
 
-    target_link_libraries(lk_sandbox lk ${wxWidgets_LIBRARIES})
+    if (MSVC AND EXISTS "$ENV{WXWIN}/wxwidgets.props")    
+        set_property(
+          TARGET lk_sandbox
+          PROPERTY VS_USER_PROPS "$ENV{WXWIN}/wxwidgets.props"
+        )
+    else()
+        target_link_libraries(lk_sandbox ${wxWidgets_LIBRARIES})
+    endif()
+endif()
+
+if (MSVC AND EXISTS "$ENV{WXWIN}/wxwidgets.props")    
+    set_property(
+        TARGET lk
+        PROPERTY VS_USER_PROPS "$ENV{WXWIN}/wxwidgets.props"
+    )
+else()
+    target_link_libraries(lk ${wxWidgets_LIBRARIES})
 endif()