diff --git a/.github/workflows/build_on_push.yml b/.github/workflows/build_on_push.yml index 07b3c39..95aaee6 100644 --- a/.github/workflows/build_on_push.yml +++ b/.github/workflows/build_on_push.yml @@ -23,11 +23,11 @@ jobs: platform: windows steps: - - name: Setup actions - uses: actions/checkout@v2 + - name: Checkout source + uses: actions/checkout@v4 with: submodules: 'recursive' - + - name: Add msbuild to PATH (Windows) uses: microsoft/setup-msbuild@v1.1 with: @@ -36,17 +36,16 @@ jobs: - 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 attach thirdparty/omnis.sdk.source/OSX-SDK-10.22.dmg + ls /volumes/OSX-SDK-10.22 + cp -a /volumes/OSX-SDK-10.22/OSX-SDK-10.22/. thirdparty/omnis.sdk/mac/ hdiutil detach /volumes/OSX-SDK-10.2-31315 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\ + tar -xf thirdparty/omnis.sdk.source/Windows-SDK-10.22-x86-x64.zip + xcopy /E /I Windows-SDK-10.22-x86-x64\* thirdparty\omnis.sdk\win\ if: matrix.platform == 'windows' - name: Build (MacOS) diff --git a/.gitmodules b/.gitmodules index d751f33..d49e256 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "thirdparty/omnis.xcomp.framework"] path = thirdparty/omnis.xcomp.framework url = https://github.com/BastiaanOlij/omnis.xcomp.framework +[submodule "thirdparty/omnis.sdk.source"] + path = thirdparty/omnis.sdk.source + url = https://github.com/OmnisStudio/Omnis-10.22-SDK diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d7d157..154e06c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,11 @@ # Changelog Notable changes to versions in this repository -## 2019-02-04 +## [1.25] - 2023-10-31 +- Fixing word wrap issue +- Update to Studio 10.22 + +## [1.24] - 2019-02-04 - Making this work on Studio 10.0 (see omnis.xcomp.example for more info) ## [1.23] - 2017-04-06 diff --git a/Src/widget.cpp b/Src/widget.cpp index 34b724c..6709b71 100644 --- a/Src/widget.cpp +++ b/Src/widget.cpp @@ -20,7 +20,7 @@ qshort mainlib::major() { }; qshort mainlib::minor() { - return 124; + return 125; }; ECOmethodEvent widgetStaticFuncs[] = { diff --git a/thirdparty/omnis.sdk.source b/thirdparty/omnis.sdk.source new file mode 160000 index 0000000..0b6ad1a --- /dev/null +++ b/thirdparty/omnis.sdk.source @@ -0,0 +1 @@ +Subproject commit 0b6ad1a89aab30f34372ba42f225696a7ed728c3 diff --git a/thirdparty/omnis.xcomp.framework b/thirdparty/omnis.xcomp.framework index da9fe12..68edfcd 160000 --- a/thirdparty/omnis.xcomp.framework +++ b/thirdparty/omnis.xcomp.framework @@ -1 +1 @@ -Subproject commit da9fe12fe000586b5b1910020662915178c4c46c +Subproject commit 68edfcde70b349c300f5f13670226481a1e77203