BastiaanOlij · BastiaanOlij · Jul 7, 2024 · Jul 7, 2024
diff --git a/.github/workflows/build_on_push.yml b/.github/workflows/build_on_push.yml
@@ -21,17 +21,17 @@ jobs:
           # faster testing by disabling the others...
           - os: macos-latest
             platform: macos
-          #- os: windows-latest
-          #  platform: windows
+          - os: windows-latest
+            platform: windows
 
     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'
@@ -47,10 +47,14 @@ jobs:
 
       - name: Get SDK (Windows)
         run: |
-          omnis_sdk=$(curl -s "https://filestore.omnis.net/omnisrestservlet/ws/5975/api/file_browser/browser/file?file=/OmnisStudio/Studio1100_36251/SDK/Windows-SDK-11-x64.zip&browsertype=0&odppid=blank" | awk {'print $1'})
-          curl -O "$omnis_sdk"
-          tar -xf Windows-SDK-11-x64.zip
-          xcopy /E /I Windows-SDK-11-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)
@@ -61,6 +65,7 @@ jobs:
       - name: Build (Windows)
         run: |
           MSBuild example.vcxproj /property:Platform=x64 /property:Configuration="Release"
+          dir build/Release_x64/xcomp/
         if: matrix.platform == 'windows'
 
       - name: Upload build files (artifacts) (MacOS)
@@ -72,11 +77,11 @@ jobs:
         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/example.dll
+            build/Release_x64/xcomp/example.dll
         if: matrix.platform == 'windows'
 
 # This job collects the build output and assembles the final asset (artifact)
@@ -89,7 +94,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 oExample

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Changelog
 Notable changes to versions in this repository
 
+## 2024-07-07
+- Moving build system to Studio 11
+
 ## ????
 - Moving build system to Studio 10.2
 - Removed all build systems

diff --git a/Src/example.cpp b/Src/example.cpp
@@ -15,7 +15,7 @@ qshort mainlib::major() {
 };
 
 qshort mainlib::minor() {
-	return 103;
+	return 104;
 };
 
 /* see omnis.xcomp.framework\oXCompLib.h for methods to implement here */

diff --git a/example.vcxproj b/example.vcxproj
diff --git a/example.vcxproj.filters b/example.vcxproj.filters
@@ -1,51 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="thirdparty\omnis.xcomp.framework\FrameworkWndProc.cpp">
-      <Filter>omnis.xcomp.framework</Filter>
-    </ClCompile>
-    <ClCompile Include="thirdparty\omnis.xcomp.framework\oBaseComponent.cpp">
-      <Filter>omnis.xcomp.framework</Filter>
-    </ClCompile>
-    <ClCompile Include="thirdparty\omnis.xcomp.framework\oBaseNVComponent.cpp">
-      <Filter>omnis.xcomp.framework</Filter>
-    </ClCompile>
-    <ClCompile Include="thirdparty\omnis.xcomp.framework\oBaseVisComponent.cpp">
-      <Filter>omnis.xcomp.framework</Filter>
-    </ClCompile>
-    <ClCompile Include="thirdparty\omnis.xcomp.framework\oDrawingCanvas.cpp">
-      <Filter>omnis.xcomp.framework</Filter>
-    </ClCompile>
-    <ClCompile Include="thirdparty\omnis.xcomp.framework\oRGBAImage.cpp">
-      <Filter>omnis.xcomp.framework</Filter>
-    </ClCompile>
-    <ClCompile Include="thirdparty\omnis.xcomp.framework\oUTF8.cpp">
-      <Filter>omnis.xcomp.framework</Filter>
-    </ClCompile>
-    <ClCompile Include="thirdparty\omnis.xcomp.framework\oXCompLib.cpp">
-      <Filter>omnis.xcomp.framework</Filter>
-    </ClCompile>
-    <ClCompile Include="thirdparty\omnis.xcomp.framework\qString.cpp">
-      <Filter>omnis.xcomp.framework</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\example.cpp" />
-    <ClCompile Include="Src\oExample.cpp" />
-    <ClCompile Include="Src\oNVExample.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="en.lproj\oExample.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="en.lproj\oExample.bmp" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="example.DEF" />
   </ItemGroup>
-  <ItemGroup>
-    <Filter Include="omnis.xcomp.framework">
-      <UniqueIdentifier>{f46b3caa-59da-41fa-aea0-0fc061e6e6e5}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
   <ItemGroup>
     <ClInclude Include="thirdparty\omnis.xcomp.framework\oBaseComponent.h">
       <Filter>omnis.xcomp.framework</Filter>
@@ -80,8 +37,73 @@
     <ClInclude Include="thirdparty\omnis.xcomp.framework\xCompStandardIncludes.h">
       <Filter>omnis.xcomp.framework</Filter>
     </ClInclude>
-    <ClInclude Include="Src\example.h" />
-    <ClInclude Include="Src\oExample.h" />
-    <ClInclude Include="Src\oNVExample.h" />
+    <ClInclude Include="Src\example.h">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClInclude Include="Src\oExample.h">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClInclude Include="Src\oNVExample.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>
+    <Filter Include="omnis.xcomp.framework">
+      <UniqueIdentifier>{f46b3caa-59da-41fa-aea0-0fc061e6e6e5}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="thirdparty\omnis.xcomp.framework\FrameworkWndProc.cpp">
+      <Filter>omnis.xcomp.framework</Filter>
+    </ClCompile>
+    <ClCompile Include="thirdparty\omnis.xcomp.framework\oBaseComponent.cpp">
+      <Filter>omnis.xcomp.framework</Filter>
+    </ClCompile>
+    <ClCompile Include="thirdparty\omnis.xcomp.framework\oBaseNVComponent.cpp">
+      <Filter>omnis.xcomp.framework</Filter>
+    </ClCompile>
+    <ClCompile Include="thirdparty\omnis.xcomp.framework\oBaseVisComponent.cpp">
+      <Filter>omnis.xcomp.framework</Filter>
+    </ClCompile>
+    <ClCompile Include="thirdparty\omnis.xcomp.framework\oDrawingCanvas.cpp">
+      <Filter>omnis.xcomp.framework</Filter>
+    </ClCompile>
+    <ClCompile Include="thirdparty\omnis.xcomp.framework\oRGBAImage.cpp">
+      <Filter>omnis.xcomp.framework</Filter>
+    </ClCompile>
+    <ClCompile Include="thirdparty\omnis.xcomp.framework\oUTF8.cpp">
+      <Filter>omnis.xcomp.framework</Filter>
+    </ClCompile>
+    <ClCompile Include="thirdparty\omnis.xcomp.framework\oXCompLib.cpp">
+      <Filter>omnis.xcomp.framework</Filter>
+    </ClCompile>
+    <ClCompile Include="thirdparty\omnis.xcomp.framework\qString.cpp">
+      <Filter>omnis.xcomp.framework</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\example.cpp">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\oExample.cpp">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\oNVExample.cpp">
+      <Filter>source</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="resources\oExample.bmp">
+      <Filter>resources</Filter>
+    </Image>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="resources\oExample.rc">
+      <Filter>resources</Filter>
+    </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/omnis.xcconfig → mac/omnis.xcconfig b/omnis.xcconfig → mac/omnis.xcconfig
diff --git a/oExample.xcodeproj/project.pbxproj b/oExample.xcodeproj/project.pbxproj
@@ -44,7 +44,7 @@
 /* Begin PBXFileReference section */
 		089C167EFE841241C02AAC07 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		304CD2D61CB7F5190096035F /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; };
-		62173718279B1A2D008C41A4 /* omnis.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = omnis.xcconfig; sourceTree = "<group>"; };
+		62173718279B1A2D008C41A4 /* omnis.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = mac/omnis.xcconfig; sourceTree = "<group>"; };
 		96CA4E650907EB0700C234AA /* complib.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = complib.framework; path = thirdparty/omnis.sdk/mac/complib/complib.framework; sourceTree = SOURCE_ROOT; };
 		DDD258BC092896A5006B6BC3 /* oExample.u_xcomp */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = oExample.u_xcomp; sourceTree = BUILT_PRODUCTS_DIR; };
 		DE1E766F2C1A86770095FAB9 /* oBaseNVComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = oBaseNVComponent.h; path = thirdparty/omnis.xcomp.framework/oBaseNVComponent.h; sourceTree = "<group>"; };

diff --git a/windows/omnis_environment.props b/windows/omnis_environment.props
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros">
+    <OMNIS_BUILD_ROOT>build\$(Configuration)_$(PlatformShortName)</OMNIS_BUILD_ROOT>
+    <OMNIS_INTBUILD_DIR>intbuild</OMNIS_INTBUILD_DIR>
+    <DEBUGSYMBOLS_LOCATION>$(OMNIS_INTBUILD_DIR)\debugsymbols_$(PlatformShortName)</DEBUGSYMBOLS_LOCATION>
+    <SDK_LOCATION>thirdparty\omnis.sdk\win</SDK_LOCATION>
+    <CONFIG>$(Configuration)</CONFIG>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OutDir>$(OMNIS_BUILD_ROOT)\</OutDir>
+    <IntDir>$(OMNIS_INTBUILD_DIR)\$(ProjectName)\$(Configuration)_$(PlatformShortName)\</IntDir>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
+      <StructMemberAlignment>$(BYTE_PACKING)</StructMemberAlignment>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <IgnoreSpecificDefaultLibraries>libc.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile Condition="'$(Configuration.Contains(`Release`))' == 'true'">$(DEBUGSYMBOLS_LOCATION)\$(TargetName).pdb</ProgramDatabaseFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="OMNIS_BUILD_ROOT">
+      <Value>$(OMNIS_BUILD_ROOT)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="OMNIS_INTBUILD_DIR">
+      <Value>$(OMNIS_INTBUILD_DIR)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="DEBUGSYMBOLS_LOCATION">
+      <Value>$(DEBUGSYMBOLS_LOCATION)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="SDK_LOCATION">
+      <Value>$(SDK_LOCATION)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="CONFIG">
+      <Value>$(CONFIG)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
diff --git a/windows/xcomp.props b/windows/xcomp.props
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup>
+    <OutDir>$(OMNIS_BUILD_ROOT)\xcomp\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>source\shared;source;..\source;..\source\shared;$(SDK_LOCATION)\include;thirdparty\omnis.xcomp.framework;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(SDK_LOCATION)\libs\$(Configuration)_$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>complib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>$(TargetName).def</ModuleDefinitionFile>
+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+      <IgnoreSpecificDefaultLibraries>libc.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <ProgramDatabaseFile Condition="'$(Configuration.Contains(`Release`))' == 'true'">$(DEBUGSYMBOLS_LOCATION)\xcomp\$(TargetName).pdb</ProgramDatabaseFile>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>