Skip to content

Commit

Permalink
Merge pull request #15 from BastiaanOlij/fix_word_wrap
Browse files Browse the repository at this point in the history
Fix word wrap issue
  • Loading branch information
BastiaanOlij authored Dec 4, 2023
2 parents b362e2f + f17f8ea commit 3eea75b
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 13 deletions.
18 changes: 8 additions & 10 deletions .github/workflows/build_on_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -36,17 +36,15 @@ 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 detach /volumes/OSX-SDK-10.2-31315
hdiutil attach thirdparty/omnis.sdk.source/OSX-SDK-10.22.dmg
cp -a /volumes/OSX-SDK-10.22/OSX_SDK_10.22/. thirdparty/omnis.sdk/mac/
hdiutil detach /volumes/OSX-SDK-10.22
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)
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Src/widget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ qshort mainlib::major() {
};

qshort mainlib::minor() {
return 124;
return 125;
};

ECOmethodEvent widgetStaticFuncs[] = {
Expand Down
1 change: 1 addition & 0 deletions thirdparty/omnis.sdk.source
Submodule omnis.sdk.source added at 0b6ad1
2 changes: 1 addition & 1 deletion thirdparty/omnis.xcomp.framework

0 comments on commit 3eea75b

Please sign in to comment.