From 484bd070750c2e5bbcbb17f3bdc2096d0cd5e194 Mon Sep 17 00:00:00 2001 From: Bastiaan Olij Date: Mon, 16 Sep 2024 13:46:28 +1000 Subject: [PATCH] Update to studio 11 --- .github/workflows/build_on_push.yml | 36 +- .github/workflows/static_checks.yml | 2 +- bgwidgets.vcxproj | 266 +++------- bgwidgets.vcxproj.filters | 52 ++ bgwidgets.xcodeproj/project.pbxproj | 489 +++++++++--------- build/.gitignore | 2 + {english.lproj => en.lproj}/InfoPlist.strings | 0 english.lproj/Bitmap.strings | 3 - english.lproj/Localizable.strings | 16 - english.lproj/RADIUSRECT.PNG | Bin 914 -> 0 bytes mac/omnis.xcconfig | 61 +++ mac/prefix_d.h | 9 + mac/prefix_r.h | 8 + {english.lproj => resources}/bgwidgets.rc | 0 {english.lproj => resources}/donut.bmp | Bin {english.lproj => resources}/radiusrect.bmp | Bin src/bgwidgets.cpp | 2 +- windows/omnis_environment.props | 51 ++ windows/xcomp.props | 22 + 19 files changed, 545 insertions(+), 474 deletions(-) create mode 100644 bgwidgets.vcxproj.filters create mode 100644 build/.gitignore rename {english.lproj => en.lproj}/InfoPlist.strings (100%) delete mode 100644 english.lproj/Bitmap.strings delete mode 100644 english.lproj/Localizable.strings delete mode 100644 english.lproj/RADIUSRECT.PNG create mode 100644 mac/omnis.xcconfig create mode 100755 mac/prefix_d.h create mode 100755 mac/prefix_r.h rename {english.lproj => resources}/bgwidgets.rc (100%) rename {english.lproj => resources}/donut.bmp (100%) rename {english.lproj => resources}/radiusrect.bmp (100%) create mode 100644 windows/omnis_environment.props create mode 100644 windows/xcomp.props diff --git a/.github/workflows/build_on_push.yml b/.github/workflows/build_on_push.yml index 90b1e33..181520e 100644 --- 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 index aa98b23..acac954 100644 --- 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 index 954096f..c509837 100644 --- a/bgwidgets.vcxproj +++ b/bgwidgets.vcxproj @@ -1,284 +1,161 @@  - + - - UNICODE Debug + + Release Win32 - - UNICODE Debug - x64 - - - UNICODE Release + + Debug Win32 - - UNICODE Release + + Release + x64 + + + Debug x64 {D377AD87-8C8E-47F3-987D-428CF82E73FF} - 10.0 - bgwidgets + bgwidgets - + + DynamicLibrary - v142 - false + false + Unicode - + DynamicLibrary - v142 - false + false + Unicode - + DynamicLibrary - v142 - false + false + Unicode - + DynamicLibrary - v142 - false + false + Unicode - + + + - + + + - + + + - + + + <_ProjectFileVersion>11.0.60315.1 - - .\URel\ - .\URel\ + false - - false - .\URel64\ - .\URel64\ - - - .\UDeb\ - .\UDeb\ + true - + + false + + true - .\UDeb64\ - .\UDeb64\ - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/GENERIC.tlb - - + + NDEBUG;isXCOMPLIB;NO_STRICT;WIN32;_WINDOWS;iswin32;isunicode;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_DEPRECATE;OMNISSDK=110;%(PreprocessorDefinitions) + MultiThreadedDLL MinSpace OnlyExplicitInline - thirdparty\omnis.sdk\win\complib;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;iswin32;isXCOMPLIB;NO_STRICT;isunicode;UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_DEPRECATE;_UNICODE;%(PreprocessorDefinitions) true - MultiThreadedDLL - 2Bytes true - false - .\URel/GENERIC.pch - .\URel/ - .\URel/ - .\URel/ - Level3 - true NDEBUG;isunicode;_UNICODE;UNICODE;%(PreprocessorDefinitions) 0x0809 - odbc32.lib;odbccp32.lib;omnisu.lib;%(AdditionalDependencies) - .\URel/generic.dll - true - thirdparty\omnis.sdk\win\ulibs;%(AdditionalLibraryDirectories) - libc.lib;%(IgnoreSpecificDefaultLibraries) - .\Generic.def - .\URel/GENERIC.pdb Windows - - .\URel/GENERIC.lib MachineX86 - false - - true - .\URel/GENERIC.bsc - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release/GENERIC.tlb - - - + - MinSpace - OnlyExplicitInline - thirdparty\omnis.sdk\win\complib;%(AdditionalIncludeDirectories) - NDEBUG;is64bit;_WINDOWS;iswin32;isXCOMPLIB;NO_STRICT;isunicode;UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_DEPRECATE;_UNICODE;OMNISSDK=102;%(PreprocessorDefinitions) - true - MultiThreadedDLL - Default - true - false - $(OutputPath)$(ProjectName).pch - $(OutputPath) - $(OutputPath) - $(OutputPath) - Level3 - true + Disabled + $(OM_C_DEBUG_FLAGS);_DEBUG;isXCOMPLIB;NO_STRICT;WIN32;_WINDOWS;iswin32;isunicode;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_DEPRECATE;OMNISSDK=110;%(PreprocessorDefinitions) + false + MultiThreadedDebugDLL - NDEBUG;isunicode;_UNICODE;UNICODE;is64bit;%(PreprocessorDefinitions) + _DEBUG;isunicode;_UNICODE;UNICODE;%(PreprocessorDefinitions) 0x0809 - odbc32.lib;odbccp32.lib;omnisu64.lib;%(AdditionalDependencies) - $(OutputPath)$(ProjectName).dll - true - thirdparty\omnis.sdk\win\ulibs;%(AdditionalLibraryDirectories) - libc.lib;%(IgnoreSpecificDefaultLibraries) - .\$(ProjectName).def - $(OutputPath)$(ProjectName).pdb + true Windows - - - $(OutputPath)$(ProjectName).lib - false + MachineX86 - - true - .\URel64/GENERIC.bsc - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/GENERIC.tlb - - + - Disabled - thirdparty\omnis.sdk\win\complib;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;iswin32;isXCOMPLIB;NO_STRICT;isunicode;_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDebugDLL - 2Bytes - false - .\UDeb/GENERIC.pch - .\UDeb/ - .\UDeb/ - .\UDeb/ - Level3 - true - EditAndContinue + MinSpace + OnlyExplicitInline + NDEBUG;isXCOMPLIB;NO_STRICT;is64bit;_WINDOWS;iswin32;isunicode;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_DEPRECATE;OMNISSDK=110;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true - _DEBUG;isunicode;_UNICODE;UNICODE;%(PreprocessorDefinitions) + NDEBUG;isunicode;_UNICODE;UNICODE;is64bit;%(PreprocessorDefinitions) 0x0809 - odbc32.lib;odbccp32.lib;omnisu.lib;%(AdditionalDependencies) - .\UDeb/generic.dll - true - thirdparty\omnis.sdk\win\ulibs;%(AdditionalLibraryDirectories) - libc.lib;%(IgnoreSpecificDefaultLibraries) - .\Generic.def - true - .\UDeb/GENERIC.pdb Windows - - .\UDeb/GENERIC.lib - MachineX86 + MachineX64 - - true - .\UDeb/GENERIC.bsc - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/GENERIC.tlb - - - + Disabled - thirdparty\omnis.sdk\win\complib;%(AdditionalIncludeDirectories) - _DEBUG;is64bit;_WINDOWS;iswin32;isXCOMPLIB;NO_STRICT;isunicode;_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_DEPRECATE;OMNISSDK=102;%(PreprocessorDefinitions) + $(OM_C_DEBUG_FLAGS);_DEBUG;isXCOMPLIB;NO_STRICT;is64bit;_WINDOWS;iswin32;isunicode;UNICODE;_UNICODE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_DEPRECATE;OMNISSDK=110;%(PreprocessorDefinitions) + false MultiThreadedDebugDLL - Default - false - $(OutputPath)$(ProjectName).pch - $(OutputPath) - $(OutputPath) - $(OutputPath) - Level3 - true - ProgramDatabase _DEBUG;isunicode;_UNICODE;UNICODE;is64bit;%(PreprocessorDefinitions) 0x0809 - odbc32.lib;odbccp32.lib;omnisu64_debug.lib;%(AdditionalDependencies) - $(OutputPath)$(ProjectName).dll - true - thirdparty\omnis.sdk\win\ulibs;%(AdditionalLibraryDirectories) - libc.lib;%(IgnoreSpecificDefaultLibraries) - .\$(ProjectName).def true - $(OutputPath)$(ProjectName).pdb Windows - - - $(OutputPath)$(ProjectName).lib + MachineX64 - - true - .\UDeb64/GENERIC.bsc - @@ -290,11 +167,7 @@ - - - - - + @@ -302,6 +175,9 @@ + + + diff --git a/bgwidgets.vcxproj.filters b/bgwidgets.vcxproj.filters new file mode 100644 index 0000000..ae9444f --- /dev/null +++ b/bgwidgets.vcxproj.filters @@ -0,0 +1,52 @@ + + + + + + + + source + + + source + + + source + + + source + + + + + {042c8f37-28e8-4eac-833d-4d8cd3ba4f61} + + + {10e9e5b8-e8a7-4a18-a057-3e0006209318} + + + + + source + + + source + + + source + + + source + + + + + resources + + + + + resources + + + diff --git a/bgwidgets.xcodeproj/project.pbxproj b/bgwidgets.xcodeproj/project.pbxproj index f8a1c85..795acc6 100755 --- a/bgwidgets.xcodeproj/project.pbxproj +++ b/bgwidgets.xcodeproj/project.pbxproj @@ -3,24 +3,22 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 55; objects = { /* Begin PBXBuildFile section */ - 2D7DE4B517CE03B300642BA9 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2D7DE4B217CE03B300642BA9 /* InfoPlist.strings */; }; - 2DAD106F17BCEE60005A7F56 /* u_complib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DAD106E17BCEE60005A7F56 /* u_complib.framework */; }; - 2DD7697817BBA5F4005F1CFB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD7697717BBA5F4005F1CFB /* Cocoa.framework */; }; - E35E3E2C27C322C700A81C66 /* donut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E35E3E2827C322C700A81C66 /* donut.cpp */; }; - E35E3E2D27C322C700A81C66 /* RadiusRect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E35E3E2927C322C700A81C66 /* RadiusRect.cpp */; }; - E35E3E2E27C322C700A81C66 /* bgwidgets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E35E3E2A27C322C700A81C66 /* bgwidgets.cpp */; }; - E35E3E2F27C322C700A81C66 /* polygon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E35E3E2B27C322C700A81C66 /* polygon.cpp */; }; - E35E3E3627C322D800A81C66 /* bgwidgets.rc in Resources */ = {isa = PBXBuildFile; fileRef = E35E3E3027C322D800A81C66 /* bgwidgets.rc */; }; - E35E3E3727C322D800A81C66 /* donut.bmp in Resources */ = {isa = PBXBuildFile; fileRef = E35E3E3227C322D800A81C66 /* donut.bmp */; }; - E35E3E3827C322D800A81C66 /* radiusrect.bmp in Resources */ = {isa = PBXBuildFile; fileRef = E35E3E3427C322D800A81C66 /* radiusrect.bmp */; }; + 304CD2D71CB7F5190096035F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 304CD2D61CB7F5190096035F /* Cocoa.framework */; }; + 96CA4E550907E8CC00C234AA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C167DFE841241C02AAC07 /* InfoPlist.strings */; }; + 96CA4E660907EB0700C234AA /* complib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96CA4E650907EB0700C234AA /* complib.framework */; }; + DE1E76922C1A86B40095FAB9 /* bgwidgets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE1E768F2C1A86B40095FAB9 /* bgwidgets.cpp */; }; + DEF6E8F62C1AAA310082AE42 /* bgwidgets.rc in Resources */ = {isa = PBXBuildFile; fileRef = DEF6E8F52C1AAA310082AE42 /* bgwidgets.rc */; }; + E32102CC2C97D1B000964546 /* polygon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E32102C92C97D1AF00964546 /* polygon.cpp */; }; + E32102CD2C97D1B000964546 /* donut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E32102CA2C97D1AF00964546 /* donut.cpp */; }; + E32102CE2C97D1B000964546 /* RadiusRect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E32102CB2C97D1B000964546 /* RadiusRect.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXBuildRule section */ - 2DDD8B9017F426C100F4E765 /* PBXBuildRule */ = { + 96CA4E5C0907E8CC00C234AA /* PBXBuildRule */ = { isa = PBXBuildRule; compilerSpec = com.apple.compilers.proxy.script; filePatterns = "*.rc"; @@ -29,401 +27,406 @@ ); isEditable = 1; outputFiles = ( - "$(INPUT_FILE_DIR)/Localizable.strings", + $INSTALL_PATH/$CONTENTS_FOLDER_PATH/Resources/en.lproj/Localizable.strings, ); - script = "$PROJECT_DIR/thirdparty/omnis.sdk/mac/tools/omnisrc64.app/Contents/MacOS/omnisrc64 INPUT_FILE_PATH TEMP_FILE_DIR REZ_SEARCH_PATHS XCOMP\nif [ -f $TEMP_FILE_DIR/omnisrc/Bitmap.strings ]; then\ncp $TEMP_FILE_DIR/omnisrc/Bitmap.strings $INSTALL_DIR/$CONTENTS_FOLDER_PATH/Resources\nfi\ncp -R $TEMP_FILE_DIR/omnisrc/ $INPUT_FILE_DIR\n\nshopt -s nullglob\nif [ ! -z \"`echo $TEMP_FILE_DIR/omnisrc/*.PNG`\" ]; then\ncp $TEMP_FILE_DIR/omnisrc/*.PNG $INSTALL_DIR/$CONTENTS_FOLDER_PATH/Resources\nfi\ncp -R $TEMP_FILE_DIR/omnisrc/ $INPUT_FILE_DIR\n"; + script = "# Check for omnisrc:\nif [ ! -d $OMNISRC_DIR/omnisrc64.app ]; then\n echo \"error: omnisrc64 is missing\"\n exit 1\nfi\n\nRES_OUT=\"$INSTALL_PATH/$CONTENTS_FOLDER_PATH/Resources\"\nmkdir -p \"$RES_OUT/en.lproj\"\n\n$OMNISRC_DIR/omnisrc64.app/Contents/MacOS/omnisrc64 INPUT_FILE_PATH TEMP_FILE_DIR REZ_SEARCH_PATHS XCOMP\n\nif [ -f $TEMP_FILE_DIR/omnisrc/Bitmap.strings ]; then\n cp $TEMP_FILE_DIR/omnisrc/Bitmap.strings \"$RES_OUT\"\nfi\nshopt -s nullglob\nif [ ! -z \"`echo $TEMP_FILE_DIR/omnisrc/*.PNG`\" ]; then\n cp $TEMP_FILE_DIR/omnisrc/*.PNG \"$RES_OUT\"\nfi\n\ncp -R $TEMP_FILE_DIR/omnisrc/Localizable.strings \"$RES_OUT/en.lproj/\"\n"; }; /* End PBXBuildRule section */ /* Begin PBXFileReference section */ - 2D7DE4B317CE03B300642BA9 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; - 2DAD106E17BCEE60005A7F56 /* u_complib.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = u_complib.framework; path = ../complib/u_complib.framework; sourceTree = ""; }; - 2DD7697417BBA5F4005F1CFB /* bgwidgets.u_xcomp */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = bgwidgets.u_xcomp; sourceTree = BUILT_PRODUCTS_DIR; }; - 2DD7697717BBA5F4005F1CFB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; - 2DD7697A17BBA5F4005F1CFB /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; - 2DD7697B17BBA5F4005F1CFB /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; }; - 2DD7697C17BBA5F4005F1CFB /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; - E35E3E2427C322AB00A81C66 /* donut.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = donut.h; path = src/donut.h; sourceTree = ""; }; - E35E3E2527C322AB00A81C66 /* RadiusRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RadiusRect.h; path = src/RadiusRect.h; sourceTree = ""; }; - E35E3E2627C322AB00A81C66 /* bgwidgets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bgwidgets.h; path = src/bgwidgets.h; sourceTree = ""; }; - E35E3E2727C322AB00A81C66 /* polygon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = polygon.h; path = src/polygon.h; sourceTree = ""; }; - E35E3E2827C322C700A81C66 /* donut.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = donut.cpp; path = src/donut.cpp; sourceTree = SOURCE_ROOT; }; - E35E3E2927C322C700A81C66 /* RadiusRect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RadiusRect.cpp; path = src/RadiusRect.cpp; sourceTree = SOURCE_ROOT; }; - E35E3E2A27C322C700A81C66 /* bgwidgets.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bgwidgets.cpp; path = src/bgwidgets.cpp; sourceTree = SOURCE_ROOT; }; - E35E3E2B27C322C700A81C66 /* polygon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = polygon.cpp; path = src/polygon.cpp; sourceTree = SOURCE_ROOT; }; - E35E3E3127C322D800A81C66 /* english */ = {isa = PBXFileReference; lastKnownFileType = text; name = english; path = english.lproj/bgwidgets.rc; sourceTree = ""; }; - E35E3E3327C322D800A81C66 /* english */ = {isa = PBXFileReference; lastKnownFileType = image.bmp; name = english; path = english.lproj/donut.bmp; sourceTree = ""; }; - E35E3E3527C322D800A81C66 /* english */ = {isa = PBXFileReference; lastKnownFileType = image.bmp; name = english; path = english.lproj/radiusrect.bmp; sourceTree = ""; }; + 089C167EFE841241C02AAC07 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; + 304CD2D61CB7F5190096035F /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; }; + 62173718279B1A2D008C41A4 /* mac/omnis.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = mac/omnis.xcconfig; sourceTree = ""; }; + 96CA4E650907EB0700C234AA /* complib.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = complib.framework; path = thirdparty/omnis.sdk/mac/complib/complib.framework; sourceTree = SOURCE_ROOT; }; + DDD258BC092896A5006B6BC3 /* bgwidgets.u_xcomp */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = bgwidgets.u_xcomp; sourceTree = BUILT_PRODUCTS_DIR; }; + DE1E768E2C1A86A00095FAB9 /* bgwidgets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bgwidgets.h; path = Src/bgwidgets.h; sourceTree = ""; }; + DE1E768F2C1A86B40095FAB9 /* bgwidgets.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bgwidgets.cpp; path = Src/bgwidgets.cpp; sourceTree = ""; }; + DEF6E8F52C1AAA310082AE42 /* bgwidgets.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = bgwidgets.rc; path = resources/bgwidgets.rc; sourceTree = ""; }; + E32102C62C97D18500964546 /* donut.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = donut.h; path = src/donut.h; sourceTree = ""; }; + E32102C72C97D19A00964546 /* polygon.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = polygon.h; path = src/polygon.h; sourceTree = ""; }; + E32102C82C97D1A300964546 /* RadiusRect.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RadiusRect.h; path = src/RadiusRect.h; sourceTree = ""; }; + E32102C92C97D1AF00964546 /* polygon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = polygon.cpp; path = src/polygon.cpp; sourceTree = ""; }; + E32102CA2C97D1AF00964546 /* donut.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = donut.cpp; path = src/donut.cpp; sourceTree = ""; }; + E32102CB2C97D1B000964546 /* RadiusRect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RadiusRect.cpp; path = src/RadiusRect.cpp; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 2DD7697117BBA5F4005F1CFB /* Frameworks */ = { + 96CA4E590907E8CC00C234AA /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 2DD7697817BBA5F4005F1CFB /* Cocoa.framework in Frameworks */, - 2DAD106F17BCEE60005A7F56 /* u_complib.framework in Frameworks */, + 304CD2D71CB7F5190096035F /* Cocoa.framework in Frameworks */, + 96CA4E660907EB0700C234AA /* complib.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 2D3F845B17C50A43008A8E5D /* Headers */ = { + 089C166AFE841209C02AAC07 /* bgwidgets */ = { isa = PBXGroup; children = ( - E35E3E2627C322AB00A81C66 /* bgwidgets.h */, - E35E3E2427C322AB00A81C66 /* donut.h */, - E35E3E2727C322AB00A81C66 /* polygon.h */, - E35E3E2527C322AB00A81C66 /* RadiusRect.h */, + 62173718279B1A2D008C41A4 /* mac/omnis.xcconfig */, + 96D631340905093100E0F291 /* Headers */, + 08FB77ADFE841716C02AAC07 /* Source */, + 089C167CFE841241C02AAC07 /* Resources */, + 089C1671FE841209C02AAC07 /* External Frameworks and Libraries */, + 19C28FB4FE9D528D11CA2CBB /* Products */, ); - name = Headers; - sourceTree = ""; - }; - 2D7DE4AF17CE02C100642BA9 /* Resources */ = { - isa = PBXGroup; - children = ( - E35E3E3027C322D800A81C66 /* bgwidgets.rc */, - E35E3E3227C322D800A81C66 /* donut.bmp */, - E35E3E3427C322D800A81C66 /* radiusrect.bmp */, - 2D7DE4B217CE03B300642BA9 /* InfoPlist.strings */, - ); - name = Resources; + name = bgwidgets; sourceTree = ""; }; - 2DD7696B17BBA5F4005F1CFB = { + 089C1671FE841209C02AAC07 /* External Frameworks and Libraries */ = { isa = PBXGroup; children = ( - 2D3F845B17C50A43008A8E5D /* Headers */, - 2DD7697D17BBA5F4005F1CFB /* Source */, - 2D7DE4AF17CE02C100642BA9 /* Resources */, - 2DD7697617BBA5F4005F1CFB /* External Frameworks and Libraries */, - 2DD7697517BBA5F4005F1CFB /* Products */, + 304CD2D61CB7F5190096035F /* Cocoa.framework */, + 96CA4E650907EB0700C234AA /* complib.framework */, ); + name = "External Frameworks and Libraries"; sourceTree = ""; }; - 2DD7697517BBA5F4005F1CFB /* Products */ = { + 089C167CFE841241C02AAC07 /* Resources */ = { isa = PBXGroup; children = ( - 2DD7697417BBA5F4005F1CFB /* bgwidgets.u_xcomp */, + DEF6E8F52C1AAA310082AE42 /* bgwidgets.rc */, + 089C167DFE841241C02AAC07 /* InfoPlist.strings */, ); - name = Products; + name = Resources; sourceTree = ""; }; - 2DD7697617BBA5F4005F1CFB /* External Frameworks and Libraries */ = { + 08FB77ADFE841716C02AAC07 /* Source */ = { isa = PBXGroup; children = ( - 2DD7697717BBA5F4005F1CFB /* Cocoa.framework */, - 2DAD106E17BCEE60005A7F56 /* u_complib.framework */, - 2DD7697917BBA5F4005F1CFB /* Other Frameworks */, + E32102CA2C97D1AF00964546 /* donut.cpp */, + E32102C92C97D1AF00964546 /* polygon.cpp */, + E32102CB2C97D1B000964546 /* RadiusRect.cpp */, + DE1E768F2C1A86B40095FAB9 /* bgwidgets.cpp */, ); - name = "External Frameworks and Libraries"; + name = Source; sourceTree = ""; }; - 2DD7697917BBA5F4005F1CFB /* Other Frameworks */ = { + 19C28FB4FE9D528D11CA2CBB /* Products */ = { isa = PBXGroup; children = ( - 2DD7697A17BBA5F4005F1CFB /* AppKit.framework */, - 2DD7697B17BBA5F4005F1CFB /* CoreData.framework */, - 2DD7697C17BBA5F4005F1CFB /* Foundation.framework */, + DDD258BC092896A5006B6BC3 /* bgwidgets.u_xcomp */, ); - name = "Other Frameworks"; + name = Products; sourceTree = ""; }; - 2DD7697D17BBA5F4005F1CFB /* Source */ = { + 96D631340905093100E0F291 /* Headers */ = { isa = PBXGroup; children = ( - E35E3E2A27C322C700A81C66 /* bgwidgets.cpp */, - E35E3E2827C322C700A81C66 /* donut.cpp */, - E35E3E2B27C322C700A81C66 /* polygon.cpp */, - E35E3E2927C322C700A81C66 /* RadiusRect.cpp */, + E32102C62C97D18500964546 /* donut.h */, + E32102C72C97D19A00964546 /* polygon.h */, + E32102C82C97D1A300964546 /* RadiusRect.h */, + DE1E768E2C1A86A00095FAB9 /* bgwidgets.h */, ); - name = Source; - path = generic; + name = Headers; sourceTree = ""; }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 2DD7697317BBA5F4005F1CFB /* UnicodeCore */ = { + 96CA4E530907E8CC00C234AA /* XCOMP */ = { isa = PBXNativeTarget; - buildConfigurationList = 2DD7698617BBA5F4005F1CFB /* Build configuration list for PBXNativeTarget "UnicodeCore" */; + buildConfigurationList = 96CA4E5D0907E8CC00C234AA /* Build configuration list for PBXNativeTarget "XCOMP" */; buildPhases = ( - 2DD7697017BBA5F4005F1CFB /* Sources */, - 2DD7697117BBA5F4005F1CFB /* Frameworks */, - 2DD7697217BBA5F4005F1CFB /* Resources */, + 96CA4E570907E8CC00C234AA /* Sources */, + 96CA4E590907E8CC00C234AA /* Frameworks */, + 96CA4E540907E8CC00C234AA /* Resources */, ); buildRules = ( - 2DDD8B9017F426C100F4E765 /* PBXBuildRule */, + 96CA4E5C0907E8CC00C234AA /* PBXBuildRule */, ); dependencies = ( ); - name = UnicodeCore; - productName = generic; - productReference = 2DD7697417BBA5F4005F1CFB /* bgwidgets.u_xcomp */; + name = XCOMP; + productInstallPath = "$(HOME)/Library/Bundles"; + productName = bgwidgets; + productReference = DDD258BC092896A5006B6BC3 /* bgwidgets.u_xcomp */; productType = "com.apple.product-type.bundle"; }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ - 2DD7696C17BBA5F4005F1CFB /* Project object */ = { + 089C1669FE841209C02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0460; - ORGANIZATIONNAME = "Omnis Software Ltd"; + LastUpgradeCheck = 1420; }; - buildConfigurationList = 2DD7696F17BBA5F4005F1CFB /* Build configuration list for PBXProject "bgwidgets" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 0; + buildConfigurationList = 96CF455E08FBABD1003AA3FE /* Build configuration list for PBXProject "bgwidgets" */; + compatibilityVersion = "Xcode 13.0"; + developmentRegion = en; + hasScannedForEncodings = 1; knownRegions = ( en, + Base, English, - english, ); - mainGroup = 2DD7696B17BBA5F4005F1CFB; - productRefGroup = 2DD7697517BBA5F4005F1CFB /* Products */; + mainGroup = 089C166AFE841209C02AAC07 /* bgwidgets */; projectDirPath = ""; projectRoot = ""; targets = ( - 2DD7697317BBA5F4005F1CFB /* UnicodeCore */, + 96CA4E530907E8CC00C234AA /* XCOMP */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 2DD7697217BBA5F4005F1CFB /* Resources */ = { + 96CA4E540907E8CC00C234AA /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 2D7DE4B517CE03B300642BA9 /* InfoPlist.strings in Resources */, - E35E3E3827C322D800A81C66 /* radiusrect.bmp in Resources */, - E35E3E3727C322D800A81C66 /* donut.bmp in Resources */, - E35E3E3627C322D800A81C66 /* bgwidgets.rc in Resources */, + 96CA4E550907E8CC00C234AA /* InfoPlist.strings in Resources */, + DEF6E8F62C1AAA310082AE42 /* bgwidgets.rc in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 2DD7697017BBA5F4005F1CFB /* Sources */ = { + 96CA4E570907E8CC00C234AA /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - E35E3E2E27C322C700A81C66 /* bgwidgets.cpp in Sources */, - E35E3E2F27C322C700A81C66 /* polygon.cpp in Sources */, - E35E3E2D27C322C700A81C66 /* RadiusRect.cpp in Sources */, - E35E3E2C27C322C700A81C66 /* donut.cpp in Sources */, + E32102CC2C97D1B000964546 /* polygon.cpp in Sources */, + DE1E76922C1A86B40095FAB9 /* bgwidgets.cpp in Sources */, + E32102CD2C97D1B000964546 /* donut.cpp in Sources */, + E32102CE2C97D1B000964546 /* RadiusRect.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXVariantGroup section */ - 2D7DE4B217CE03B300642BA9 /* InfoPlist.strings */ = { + 089C167DFE841241C02AAC07 /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( - 2D7DE4B317CE03B300642BA9 /* English */, + 089C167EFE841241C02AAC07 /* en */, ); name = InfoPlist.strings; sourceTree = ""; }; - E35E3E3027C322D800A81C66 /* bgwidgets.rc */ = { - isa = PBXVariantGroup; - children = ( - E35E3E3127C322D800A81C66 /* english */, - ); - name = bgwidgets.rc; - sourceTree = ""; - }; - E35E3E3227C322D800A81C66 /* donut.bmp */ = { - isa = PBXVariantGroup; - children = ( - E35E3E3327C322D800A81C66 /* english */, - ); - name = donut.bmp; - sourceTree = ""; - }; - E35E3E3427C322D800A81C66 /* radiusrect.bmp */ = { - isa = PBXVariantGroup; - children = ( - E35E3E3527C322D800A81C66 /* english */, - ); - name = radiusrect.bmp; - sourceTree = ""; - }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 2DD7698417BBA5F4005F1CFB /* Development */ = { + 96CA4E5E0907E8CC00C234AA /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 62173718279B1A2D008C41A4 /* mac/omnis.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - CLANG_CXX_LANGUAGE_STANDARD = "compiler-default"; - CLANG_CXX_LIBRARY = "compiler-default"; + BUILD_VARIANTS = normal; + CLANG_CXX_LANGUAGE_STANDARD = $CPP_LANG_DIALECT; + CLANG_CXX_LIBRARY = $CPP_STD_LIBRARY; CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = ""; - CONFIGURATION_BUILD_DIR = $PROJECT_DIR/_OSXUnicodeDbg; + CLANG_ENABLE_OBJC_WEAK = NO; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO; + CODE_SIGN_IDENTITY = $OMNIS_CODE_SIGNING_IDENTITY; + CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO; + CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - GCC_C_LANGUAGE_STANDARD = "compiler-default"; + DEPLOYMENT_LOCATION = YES; + FRAMEWORK_SEARCH_PATHS = $OMNIS_XCOMP_FRAMEWORK_PATH; + GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_INPUT_FILETYPE = sourcecode.cpp.objcpp; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; - ONLY_ACTIVE_ARCH = YES; - OTHER_CFLAGS = ( + GCC_PRECOMPILE_PREFIX_HEADER = NO; + GCC_PREFIX_HEADER = "$(PROJECT_DIR)/mac/prefix_d.h"; + GCC_WARN_64_TO_32_BIT_CONVERSION = "$(CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION)"; + GENERATE_PKGINFO_FILE = YES; + HEADER_SEARCH_PATHS = $OMNIS_XCOMP_HEADER_PATHS; + INFOPLIST_FILE = $PROJECT_DIR/Info.plist; + INIT_ROUTINE = ""; + INSTALL_PATH = $OMNIS_XCOMP_INSTALL_DIR; + LIBRARY_STYLE = DYNAMIC; + MACOSX_DEPLOYMENT_TARGET = $OMNIS_DEPLOYMENT_TARGET; + ONLY_ACTIVE_ARCH = $OMNIS_ACTIVE_ARCH_ONLY; + OTHER_CFLAGS = "$(OMNIS_C_FLAGS)"; + OTHER_CPLUSPLUSFLAGS = ( + "$(OTHER_CFLAGS)", "-fshort-wchar", "-Dismach_o", "-Wno-comment", - "-DOMNISSDK=102", + "-Wno-switch", ); - PRESERVE_DEAD_CODE_INITS_AND_TERMS = NO; + OTHER_LDFLAGS = ""; + PRODUCT_BUNDLE_IDENTIFIER = $XCOMP_BUNDLE_IDENTIFIER; + PRODUCT_NAME = $XCOMP_PRODUCT_NAME; + RESMERGER_SOURCES_FORK = data; REZ_SEARCH_PATHS = ( $PROJECT_DIR, - $PROJECT_DIR/English.lproj, + $PROJECT_DIR/en.lproj, + $OMNIS_XCOMP_REZ_PATHS, ); - SDKROOT = macosx; - STRIP_INSTALLED_PRODUCT = NO; + SDKROOT = $OMNIS_SDK_ROOT; + WRAPPER_EXTENSION = u_xcomp; + ZERO_LINK = NO; }; name = Development; }; - 2DD7698517BBA5F4005F1CFB /* Deployment */ = { + 96CA4E5F0907E8CC00C234AA /* Deployment */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 62173718279B1A2D008C41A4 /* mac/omnis.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - CLANG_CXX_LANGUAGE_STANDARD = "compiler-default"; - CLANG_CXX_LIBRARY = "compiler-default"; + CLANG_CXX_LANGUAGE_STANDARD = $CPP_LANG_DIALECT; + CLANG_CXX_LIBRARY = $CPP_STD_LIBRARY; CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = ""; - CONFIGURATION_BUILD_DIR = $PROJECT_DIR/_OSXUnicode; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = dwarf; - GCC_C_LANGUAGE_STANDARD = "compiler-default"; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + CLANG_ENABLE_OBJC_WEAK = NO; + CLANG_WARN_BOOL_CONVERSION = "$(CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION)"; + CLANG_WARN_CONSTANT_CONVERSION = "$(CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION)"; + CLANG_WARN_ENUM_CONVERSION = "$(CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION)"; + CLANG_WARN_INT_CONVERSION = "$(CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION)"; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO; + CODE_SIGN_IDENTITY = $OMNIS_CODE_SIGNING_IDENTITY; + CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO; + CODE_SIGN_STYLE = Manual; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEPLOYMENT_LOCATION = YES; + DWARF_DSYM_FOLDER_PATH = $DWARF_DSYM_FOLDER_PATH_PREFIX/$OMNIS_XCOMP_DIR; + FRAMEWORK_SEARCH_PATHS = $OMNIS_XCOMP_FRAMEWORK_PATH; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_INPUT_FILETYPE = sourcecode.cpp.objcpp; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; - OTHER_CFLAGS = ( + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = NO; + GCC_PREFIX_HEADER = "$(PROJECT_DIR)/mac/prefix_r.h"; + GCC_WARN_64_TO_32_BIT_CONVERSION = "$(CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION)"; + GENERATE_PKGINFO_FILE = YES; + HEADER_SEARCH_PATHS = $OMNIS_XCOMP_HEADER_PATHS; + INFOPLIST_FILE = $PROJECT_DIR/Info.plist; + INSTALL_PATH = $OMNIS_XCOMP_INSTALL_DIR; + LIBRARY_STYLE = DYNAMIC; + MACOSX_DEPLOYMENT_TARGET = $OMNIS_DEPLOYMENT_TARGET; + ONLY_ACTIVE_ARCH = $OMNIS_ACTIVE_ARCH_ONLY; + OTHER_CFLAGS = "$(OMNIS_C_FLAGS)"; + OTHER_CPLUSPLUSFLAGS = ( + "$(OTHER_CFLAGS)", "-fshort-wchar", "-Dismach_o", "-Wno-comment", - "-DOMNISSDK=102", + "-Wno-switch", ); - PRESERVE_DEAD_CODE_INITS_AND_TERMS = NO; + PRODUCT_BUNDLE_IDENTIFIER = $XCOMP_BUNDLE_IDENTIFIER; + PRODUCT_NAME = $XCOMP_PRODUCT_NAME; + RESMERGER_SOURCES_FORK = data; REZ_SEARCH_PATHS = ( $PROJECT_DIR, - $PROJECT_DIR/English.lproj, + $PROJECT_DIR/en.lproj, + $OMNIS_XCOMP_REZ_PATHS, ); - SDKROOT = macosx; - STRIP_INSTALLED_PRODUCT = NO; + SDKROOT = $OMNIS_SDK_ROOT; + SKIP_INSTALL = NO; + WRAPPER_EXTENSION = u_xcomp; + ZERO_LINK = NO; }; name = Deployment; }; - 2DD7698717BBA5F4005F1CFB /* Development */ = { + 96CF455F08FBABD1003AA3FE /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_CXX_LIBRARY = "libc++"; - COMBINE_HIDPI_IMAGES = YES; - CONFIGURATION_TEMP_DIR = "$(PROJECT_DIR)"; - DSTROOT = /; - EXPORTED_SYMBOLS_FILE = ""; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/thirdparty/omnis.sdk/mac/complib\"", - ); - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = $PROJECT_DIR/thirdparty/omnis.sdk/mac/complib/u_complib.framework/Headers/carbnuni.h; - GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = $PROJECT_DIR/thirdparty/omnis.sdk/mac/complib/u_complib.framework/Headers; - INFOPLIST_FILE = $PROJECT_DIR/Info.plist; - INSTALL_PATH = $PROJECT_DIR/_OSXUnicodeDbg; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_CXX_LANGUAGE_STANDARD = $CPP_LANG_DIALECT; + CLANG_CXX_LIBRARY = $CPP_STD_LIBRARY; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = "$(CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION)"; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = "$(CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION)"; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = "$(CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION)"; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = "$(CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION)"; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + LIBRARY_STYLE = DYNAMIC; MACOSX_DEPLOYMENT_TARGET = 10.11; - OTHER_LDFLAGS = ""; - PRESERVE_DEAD_CODE_INITS_AND_TERMS = NO; - PRODUCT_BUNDLE_IDENTIFIER = omnis.xcomp.bgwidgets; - PRODUCT_NAME = bgwidgets; - WRAPPER_EXTENSION = u_xcomp; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = $OMNIS_SDK_ROOT; }; name = Development; }; - 2DD7698817BBA5F4005F1CFB /* Deployment */ = { + 96CF456008FBABD1003AA3FE /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_CXX_LIBRARY = "libc++"; - COMBINE_HIDPI_IMAGES = YES; - CONFIGURATION_TEMP_DIR = "$(PROJECT_DIR)"; - DSTROOT = /; - EXPORTED_SYMBOLS_FILE = ""; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/thirdparty/omnis.sdk/mac/complib\"", - ); - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = $PROJECT_DIR/thirdparty/omnis.sdk/mac/complib/u_complib.framework/Headers/carbnuni.h; - GENERATE_PKGINFO_FILE = YES; - HEADER_SEARCH_PATHS = $PROJECT_DIR/thirdparty/omnis.sdk/mac/complib/u_complib.framework/Headers; - INFOPLIST_FILE = $PROJECT_DIR/Info.plist; - INSTALL_PATH = $PROJECT_DIR/_OSXUnicode; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_CXX_LANGUAGE_STANDARD = $CPP_LANG_DIALECT; + CLANG_CXX_LIBRARY = $CPP_STD_LIBRARY; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = "$(CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION)"; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = "$(CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION)"; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = "$(CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION)"; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = "$(CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION)"; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.11; - OTHER_LDFLAGS = ""; - PRESERVE_DEAD_CODE_INITS_AND_TERMS = NO; - PRODUCT_BUNDLE_IDENTIFIER = omnis.xcomp.bgwidgets; - PRODUCT_NAME = bgwidgets; - WRAPPER_EXTENSION = u_xcomp; + SDKROOT = $OMNIS_SDK_ROOT; }; name = Deployment; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 2DD7696F17BBA5F4005F1CFB /* Build configuration list for PBXProject "bgwidgets" */ = { + 96CA4E5D0907E8CC00C234AA /* Build configuration list for PBXNativeTarget "XCOMP" */ = { isa = XCConfigurationList; buildConfigurations = ( - 2DD7698417BBA5F4005F1CFB /* Development */, - 2DD7698517BBA5F4005F1CFB /* Deployment */, + 96CA4E5E0907E8CC00C234AA /* Development */, + 96CA4E5F0907E8CC00C234AA /* Deployment */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Deployment; }; - 2DD7698617BBA5F4005F1CFB /* Build configuration list for PBXNativeTarget "UnicodeCore" */ = { + 96CF455E08FBABD1003AA3FE /* Build configuration list for PBXProject "bgwidgets" */ = { isa = XCConfigurationList; buildConfigurations = ( - 2DD7698717BBA5F4005F1CFB /* Development */, - 2DD7698817BBA5F4005F1CFB /* Deployment */, + 96CF455F08FBABD1003AA3FE /* Development */, + 96CF456008FBABD1003AA3FE /* Deployment */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Deployment; }; /* End XCConfigurationList section */ }; - rootObject = 2DD7696C17BBA5F4005F1CFB /* Project object */; + rootObject = 089C1669FE841209C02AAC07 /* Project object */; } diff --git a/build/.gitignore b/build/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/build/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/english.lproj/InfoPlist.strings b/en.lproj/InfoPlist.strings similarity index 100% rename from english.lproj/InfoPlist.strings rename to en.lproj/InfoPlist.strings diff --git a/english.lproj/Bitmap.strings b/english.lproj/Bitmap.strings deleted file mode 100644 index 6a46f6d..0000000 --- a/english.lproj/Bitmap.strings +++ /dev/null @@ -1,3 +0,0 @@ -{ -"COMP_RES_1" = "RADIUSRECT.PNG"; -} diff --git a/english.lproj/Localizable.strings b/english.lproj/Localizable.strings deleted file mode 100644 index 331efc3..0000000 --- a/english.lproj/Localizable.strings +++ /dev/null @@ -1,16 +0,0 @@ -{ -"COMP_RES_1000" = "Background widgets Library"; -"COMP_RES_2000" = "RadiusRect"; -"COMP_RES_2001" = "Donut"; -"COMP_RES_2002" = "Polygon"; -"COMP_RES_4000" = "$radius:Radius of our corners"; -"COMP_RES_4001" = "$linewidth:Width of our border (0 = no border)"; -"COMP_RES_4010" = "$innerradius:Inner radius of donut"; -"COMP_RES_4011" = "$basecolor:Base color of donut"; -"COMP_RES_4012" = "$colorindex:Index into our color array"; -"COMP_RES_4013" = "$colorangle:Angle at which to start the color"; -"COMP_RES_4014" = "$color:Color from this angle forward"; -"COMP_RES_4015" = "$offsetangle:Offset angle"; -"COMP_RES_4020" = "$points:Points on our polygon"; -"COMP_RES_31000" = "bgwidgetsWndProc"; -} diff --git a/english.lproj/RADIUSRECT.PNG b/english.lproj/RADIUSRECT.PNG deleted file mode 100644 index 8ca56836f42cfebb562e3c28c12554b24c6fd241..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 914 zcmW+!F>94U5S-)@&_`lKQmEAm78a&UA!4zS7m|R4peeLlNMk7oRtke);Xkm_6@ykv ze!>=3A{N#biO4R8nTdX{t*_n# zCfL7ou%%C)Zk`_07g<_A>iw4!H-v$PG?bwYaG1j#;h-ZO27Vtm>7|1{cIv_kF zoCpdSNfgoIN?5`ZkzgVdmFNTtR`5a;Sja*Zx`2i?yb%pHvQdq00B&O(k3r%&u6n~Y zrJ1{VnA1GX%e>9itFl(O(>>kGy#)|%F{%;H@C>i;4wp#dXbn2)NiTZSrQCAdk94MI zdZl-|?64Z3QO@!#uktRJN7gQ;XlHx2S9`Z(xGOluu!lKBvq8CLHn_t`V;alYMhrD$ zpcvzbStP=v{IwWUMv%b_RSJ+(n1gYC3&h=R4n4cax z^-t^m_l=qAXCLi6cnqBTru}(g<9PjgM9|{4Kt2 y{+!QO*A}k4TKqe;-!E=1|GKd8;oYCrqv;ax`qtsn^*0|&7}(v~n|-<+&;J9~EosgG diff --git a/mac/omnis.xcconfig b/mac/omnis.xcconfig new file mode 100644 index 0000000..bf64b55 --- /dev/null +++ b/mac/omnis.xcconfig @@ -0,0 +1,61 @@ +// +// omnis.xcconfig +// build_all +// +// Copyright © 2023 Omnis Software Ltd. All rights reserved. +// + +// Configuration settings file format documentation can be found at: +// https://help.apple.com/xcode/#/dev745c5c974 + +XCOMP_BUNDLE_IDENTIFIER = omnis.xcomp.bgwidgets +XCOMP_PRODUCT_NAME = bgwidgets + +OMNIS_SDK_ROOT = macosx +OMNIS_DEPLOYMENT_TARGET = 10.14 +OMNIS_BUILD_ROOT = $(SRCROOT)/build +CPP_LANG_DIALECT = c++17 +CPP_STD_LIBRARY = libc++ + +MACOSX_DEPLOYMENT_TARGET = $OMNIS_DEPLOYMENT_TARGET +OMNIS_ACTIVE_ARCH_ONLY[config=Deployment] = NO +OMNIS_ACTIVE_ARCH_ONLY[config=Development] = YES +ONLY_ACTIVE_ARCH = $OMNIS_ACTIVE_ARCH_ONLY +ARCHS = $(ARCHS_STANDARD) +DEPLOYMENT_LOCATION = YES +SKIP_INSTALL = NO +INSTALL_ROOT = / +INSTALL_PATH = / +ALWAYS_SEARCH_USER_PATHS = NO +CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO +CODE_SIGN_STYLE = Manual + +OMNIS_CODE_SIGNING_IDENTITY[config=Deployment] = - +OMNIS_CODE_SIGNING_IDENTITY[config=Development] = - + +OMNIS_CONFIG[config=Deployment] = Release +OMNIS_CONFIG[config=Development] = Debug + +OMNIS_FILES_ROOT = $OMNIS_BUILD_ROOT/$OMNIS_CONFIG + +COMPLIB_DIR[config=Deployment] = $(SRCROOT)/thirdparty/omnis.sdk/mac/complib +COMPLIB_DIR[config=Development] = $(SRCROOT)/thirdparty/omnis.sdk/mac/complib_debug + +OMNISRC_DIR = $(SRCROOT)/thirdparty/omnis.sdk/mac/tools + +DWARF_DSYM_FOLDER_PATH_PREFIX = $(OMNIS_BUILD_ROOT)/DebugSymbols + +// jscomp +OMNIS_JSCOMP_DIR = jscomp +OMNIS_JSCOMP_INSTALL_DIR = $OMNIS_FILES_ROOT/$OMNIS_JSCOMP_DIR +OMNIS_JSCOMP_PREFIX_PATH = $COMPLIB_DIR/complib.framework/Versions/A/Headers/carbnuni.h + +// xcomp +OMNIS_XCOMP_DIR = xcomp +OMNIS_XCOMP_INSTALL_DIR = $OMNIS_FILES_ROOT/$OMNIS_XCOMP_DIR +OMNIS_XCOMP_HEADER_PATHS = $COMPLIB_DIR/complib.framework/Headers +OMNIS_XCOMP_REZ_PATHS = $COMPLIB_DIR/complib.framework/Versions/A/Resources +OMNIS_XCOMP_PREFIX_PATH = $COMPLIB_DIR/complib.framework/Versions/A/Headers/carbnuni.h +OMNIS_XCOMP_FRAMEWORK_PATH = $COMPLIB_DIR/ + +OMNIS_C_FLAGS = "-DOMNISSDK=110" diff --git a/mac/prefix_d.h b/mac/prefix_d.h new file mode 100755 index 0000000..4d04dd5 --- /dev/null +++ b/mac/prefix_d.h @@ -0,0 +1,9 @@ +#define TESTVER 0 +#define _DEBUG + +#define mach_o_unicode +#define isunicode +#define UNICODE +#define _UNICODE + +#include "carbnuni.h" diff --git a/mac/prefix_r.h b/mac/prefix_r.h new file mode 100755 index 0000000..8188078 --- /dev/null +++ b/mac/prefix_r.h @@ -0,0 +1,8 @@ +#define TESTVER 0 + +#define mach_o_unicode +#define isunicode +#define UNICODE +#define _UNICODE + +#include "carbnuni.h" diff --git a/english.lproj/bgwidgets.rc b/resources/bgwidgets.rc similarity index 100% rename from english.lproj/bgwidgets.rc rename to resources/bgwidgets.rc diff --git a/english.lproj/donut.bmp b/resources/donut.bmp similarity index 100% rename from english.lproj/donut.bmp rename to resources/donut.bmp diff --git a/english.lproj/radiusrect.bmp b/resources/radiusrect.bmp similarity index 100% rename from english.lproj/radiusrect.bmp rename to resources/radiusrect.bmp diff --git a/src/bgwidgets.cpp b/src/bgwidgets.cpp index e9a9b26..4bcae7e 100644 --- a/src/bgwidgets.cpp +++ b/src/bgwidgets.cpp @@ -81,7 +81,7 @@ extern "C" LRESULT OMNISWNDPROC bgwidgetsWndProc(HWND hwnd, UINT Msg, WPARAM wPa // ECM_GETVERSION ask for version info case ECM_GETVERSION: { qshort major = OMNISSDK; - qshort minor = 4; + qshort minor = 5; return ECOreturnVersion(major, minor); } break; diff --git a/windows/omnis_environment.props b/windows/omnis_environment.props new file mode 100644 index 0000000..65a341e --- /dev/null +++ b/windows/omnis_environment.props @@ -0,0 +1,51 @@ + + + + + build\$(Configuration)_$(PlatformShortName) + intbuild + $(OMNIS_INTBUILD_DIR)\debugsymbols_$(PlatformShortName) + thirdparty\omnis.sdk\win + $(Configuration) + + + $(OMNIS_BUILD_ROOT)\ + $(OMNIS_INTBUILD_DIR)\$(ProjectName)\$(Configuration)_$(PlatformShortName)\ + 10.0.22621.0 + + + + Level3 + false + $(BYTE_PACKING) + stdcpp17 + + + libc.lib;%(IgnoreSpecificDefaultLibraries) + true + $(DEBUGSYMBOLS_LOCATION)\$(TargetName).pdb + + + + + $(OMNIS_BUILD_ROOT) + true + + + $(OMNIS_INTBUILD_DIR) + true + + + $(DEBUGSYMBOLS_LOCATION) + true + + + $(SDK_LOCATION) + true + + + $(CONFIG) + true + + + \ No newline at end of file diff --git a/windows/xcomp.props b/windows/xcomp.props new file mode 100644 index 0000000..c4465c0 --- /dev/null +++ b/windows/xcomp.props @@ -0,0 +1,22 @@ + + + + + $(OMNIS_BUILD_ROOT)\xcomp\ + + + + source\shared;source;..\source;..\source\shared;$(SDK_LOCATION)\include;thirdparty\omnis.xcomp.framework;%(AdditionalIncludeDirectories) + false + true + + + $(SDK_LOCATION)\libs\$(Configuration)_$(PlatformShortName);%(AdditionalLibraryDirectories) + complib.lib;%(AdditionalDependencies) + $(TargetName).def + $(IntDir)$(TargetName).lib + libc.lib;%(IgnoreSpecificDefaultLibraries) + $(DEBUGSYMBOLS_LOCATION)\xcomp\$(TargetName).pdb + + + \ No newline at end of file