Update to studio 11

BastiaanOlij · Sep 16, 2024 · 771b5fd · 771b5fd
1 parent 8013a1d
commit 771b5fd
Show file tree

Hide file tree

Showing 18 changed files with 544 additions and 473 deletions.
diff --git a/.github/workflows/build_on_push.yml b/.github/workflows/build_on_push.yml
@@ -26,29 +26,35 @@ jobs:
 
     steps:
       - name: Setup actions
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           submodules: 'recursive'
 
       - name: Add msbuild to PATH (Windows)
-        uses: microsoft/setup-msbuild@v1.1
+        uses: microsoft/setup-msbuild@v2
         with:
           msbuild-architecture: x64
         if: matrix.platform == 'windows'
 
       - name: Get SDK (MacOS)
         run: |
-          curl -O "ftp://ftp.omnis.net/OmnisStudio/Studio102_31315/SDK/osx64/OSX-SDK-10.2-31315.dmg"
-          hdiutil attach OSX-SDK-10.2-31315.dmg
-          cp -a /volumes/OSX-SDK-10.2-31315/OSX-SDK-10.2-31315/. thirdparty/omnis.sdk/mac/
-          hdiutil detach /volumes/OSX-SDK-10.2-31315
+          omnis_sdk=$(curl -s "https://filestore.omnis.net/omnisrestservlet/ws/5975/api/file_browser/browser/file?file=/OmnisStudio/Studio1100_36251/SDK/macOS-SDK-11-36251.dmg&browsertype=0&odppid=blank" | awk {'print $1'})
+          curl -O "$omnis_sdk"
+          hdiutil attach macOS-SDK-11-36251.dmg
+          cp -a /volumes/macOS-SDK-11-36251/macOS_SDK_11_36251/. thirdparty/omnis.sdk/mac/
+          hdiutil detach /volumes/macOS-SDK-11-36251
         if: matrix.platform == 'macos'
 
       - name: Get SDK (Windows)
         run: |
-          curl -O "ftp://ftp.omnis.net/OmnisStudio/Studio102_31315/SDK/windows/Windows-SDK-10.2-31315-x86-x64.zip"
-          tar -xf Windows-SDK-10.2-31315-x86-x64.zip
-          xcopy /E /I Windows-SDK-10.2-31315-x86-x64\* thirdparty\omnis.sdk\win\
+          $response = Invoke-WebRequest -uri "https://filestore.omnis.net/omnisrestservlet/ws/5975/api/file_browser/browser/file?file=/OmnisStudio/Studio1100_36251/SDK/Windows-SDK-11-36251-x64.zip&browsertype=0&odppid=blank"
+          $omnissdk = [System.Text.Encoding]::UTF8.GetString($response.content)
+          Invoke-WebRequest -uri $omnissdk -OutFile WindowsSDK.zip
+          mkdir WindowsSDK
+          cd WindowsSDK
+          tar -xf ../WindowsSDK.zip
+          cd ..
+          xcopy /E /I WindowsSDK\* thirdparty\omnis.sdk\win\
         if: matrix.platform == 'windows'
 
       - name: Build (MacOS)
@@ -58,23 +64,23 @@ jobs:
 
       - name: Build (Windows)
         run: |
-          MSBuild bgwidgets.vcxproj /property:Platform=x64 /property:Configuration="UNICODE Release"
+          MSBuild bgwidgets.vcxproj /property:Platform=x64 /property:Configuration="Release"
         if: matrix.platform == 'windows'
 
       - name: Upload build files (artifacts) (MacOS)
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: xcomp-macos
           path: |
-            _OSXUnicode
+            build/release
         if: matrix.platform == 'macos'
 
       - name: Upload build files (artifacts) (Windows)
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: xcomp-windows
           path: |
-            URel64/bgwidgets.dll
+            build/Release_x64/xcomp/bgwidgets.dll
         if: matrix.platform == 'windows'
 
 # This job collects the build output and assembles the final asset (artifact)
@@ -87,7 +93,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       - name: Download all workflow run artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
       - name: Copy files to destination
         run: |
           mkdir bgwidgets

diff --git a/.github/workflows/static_checks.yml b/.github/workflows/static_checks.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Install dependencies
         run: |

diff --git a/bgwidgets.vcxproj b/bgwidgets.vcxproj
diff --git a/bgwidgets.vcxproj.filters b/bgwidgets.vcxproj.filters
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <None Include="bgwidgets.DEF" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\bgwidgets.h">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClInclude Include="src\donut.h">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClInclude Include="src\polygon.h">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClInclude Include="src\RediusRect.h">
+      <Filter>source</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="source">
+      <UniqueIdentifier>{042c8f37-28e8-4eac-833d-4d8cd3ba4f61}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="resources">
+      <UniqueIdentifier>{10e9e5b8-e8a7-4a18-a057-3e0006209318}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\bgwidgets.cpp">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="src\donut.cpp">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="src\polygon.cpp">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="src\RediusRect.cpp">
+      <Filter>source</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="resources\radiusrect.bmp">
+      <Filter>resources</Filter>
+    </Image>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="resources\bgwidgets.rc">
+      <Filter>resources</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>