updated cmake

ReferenceType · Apr 8, 2024 · 945f2d1 · 945f2d1
1 parent 4c4a41c
commit 945f2d1
Show file tree

Hide file tree

Showing 17 changed files with 213 additions and 25 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -0,0 +1,15 @@
+# CMakeList.txt : Top-level CMake project file, do global configuration
+# and include sub-projects here.
+#
+cmake_minimum_required (VERSION 3.8)
+
+# Enable Hot Reload for MSVC compilers if supported.
+if (POLICY CMP0141)
+  cmake_policy(SET CMP0141 NEW)
+  set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<IF:$<AND:$<C_COMPILER_ID:MSVC>,$<CXX_COMPILER_ID:MSVC>>,$<$<CONFIG:Debug,RelWithDebInfo>:EditAndContinue>,$<$<CONFIG:Debug,RelWithDebInfo>:ProgramDatabase>>")
+endif()
+
+project ("OpenH264Wrapper2")
+
+# Include sub-projects.
+add_subdirectory ("H264SharpNative")
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -0,0 +1,121 @@
+{
+  "version": 3,
+  "configurePresets": [
+    {
+      "name": "windows-base",
+      "hidden": true,
+      "generator": "Ninja",
+      "binaryDir": "${sourceDir}/out/build/${presetName}",
+      "installDir": "${sourceDir}/out/install/${presetName}",
+      "cacheVariables": {
+        "CMAKE_C_COMPILER": "cl.exe",
+        "CMAKE_CXX_COMPILER": "cl.exe"
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
+      }
+    },
+    {
+      "name": "x64-debug",
+      "displayName": "x64 Debug",
+      "inherits": "windows-base",
+      "architecture": {
+        "value": "x64",
+        "strategy": "external"
+      },
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug"
+      }
+    },
+    {
+      "name": "x64-release",
+      "displayName": "x64 Release",
+      "inherits": "x64-debug",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release"
+      }
+    },
+    {
+      "name": "x86-debug",
+      "displayName": "x86 Debug",
+      "inherits": "windows-base",
+      "architecture": {
+        "value": "x86",
+        "strategy": "external"
+      },
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug"
+      }
+    },
+    {
+      "name": "x86-release",
+      "displayName": "x86 Release",
+      "inherits": "x86-debug",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release"
+      }
+    },
+    {
+      "name": "linux-debug",
+      "displayName": "Linux Debug",
+      "generator": "Ninja",
+      "binaryDir": "${sourceDir}/out/build/${presetName}",
+      "installDir": "${sourceDir}/out/install/${presetName}",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug"
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Linux"
+      },
+      "vendor": {
+        "microsoft.com/VisualStudioRemoteSettings/CMake/1.0": {
+          "sourceDir": "$env{HOME}/.vs/$ms{projectDirName}"
+        }
+      }
+    },
+    {
+      "name": "linux-release",
+      "displayName": "Linux Release",
+      "generator": "Ninja",
+      "binaryDir": "${sourceDir}/out/build/${presetName}",
+      "installDir": "${sourceDir}/out/install/${presetName}",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release"
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Linux"
+      },
+      "vendor": {
+        "microsoft.com/VisualStudioRemoteSettings/CMake/1.0": {
+          "sourceDir": "$env{HOME}/.vs/$ms{projectDirName}"
+        }
+      }
+    },
+    {
+      "name": "macos-debug",
+      "displayName": "macOS Debug",
+      "generator": "Ninja",
+      "binaryDir": "${sourceDir}/out/build/${presetName}",
+      "installDir": "${sourceDir}/out/install/${presetName}",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug"
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Darwin"
+      },
+      "vendor": {
+        "microsoft.com/VisualStudioRemoteSettings/CMake/1.0": {
+          "sourceDir": "$env{HOME}/.vs/$ms{projectDirName}"
+        }
+      }
+    }
+  ]
+}
diff --git a/CrossPlatformTest/CrossPlatformTest.csproj b/CrossPlatformTest/CrossPlatformTest.csproj
@@ -9,19 +9,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\H264Sharp\H264Sharp.csproj" />
+    <PackageReference Include="H264Sharp-linux" Version="1.3.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="H264SharpNative-linux64.so">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Update="H264SharpNative-win64.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="libopenh264-2.4.1-linux64.7.so">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Update="openh264-2.4.1-win64.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

diff --git a/CrossPlatformTest/H264SharpNative-linux64.so b/CrossPlatformTest/H264SharpNative-linux64.so
diff --git a/CrossPlatformTest/H264SharpNative-win64.dll b/CrossPlatformTest/H264SharpNative-win64.dll
diff --git a/CrossPlatformTest/libopenh264-2.4.1-linux64.7.so b/CrossPlatformTest/libopenh264-2.4.1-linux64.7.so
diff --git a/CrossPlatformTest/openh264-2.4.1-win64.dll b/CrossPlatformTest/openh264-2.4.1-win64.dll
diff --git a/H264Sharp/Defines.cs b/H264Sharp/Defines.cs
@@ -11,8 +11,8 @@ public class Defines
         public const string WrapperDllName64bit = "H264SharpNative-win64.dll";
         public const string WrapperDllName32bit = "H264SharpNative-win32.dll";
 #elif OS_LINUX
-        public static string CiscoDllName64bit = "libopenh264-2.4.1-linux64.7.so";
-        public static string CiscoDllName32bit = "libopenh264-2.4.1-linux32.7.so";
+        public static string CiscoDllName64bit = "./libopenh264-2.4.1-linux64.7.so";
+        public static string CiscoDllName32bit = "./libopenh264-2.4.1-linux32.7.so";
 
         public const string WrapperDllName64bit = "H264SharpNative-linux64.so";
         public const string WrapperDllName32bit = "H264SharpNative-linux32.so";

diff --git a/H264Sharp/H264Sharp.csproj b/H264Sharp/H264Sharp.csproj
@@ -1,17 +1,32 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
+  <!--<Target Name="AfterBuild">
+    <ItemGroup>
+      <_ContentFiles Include="$(MSBuildThisFileDirectory)..\contentFiles\any\any\**\*.so" />
+    </ItemGroup>
 
+    <Copy SourceFiles="@(_ContentFiles)" DestinationFolder="$(OutDir)\%(RecursiveDir)" SkipUnchangedFiles="true" OverwriteReadOnlyFiles="true" />
+  </Target>-->
+  <Target Name="AfterBuild">
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)\runtimes\linux64\native\H264SharpNative-linux64.so">
+      <Link>H264SharpNative-linux64.so</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  </Target>
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Title>H264Sharp</Title>
-    <Version>1.2.1</Version>
+    <Title>H264Sharp-linux</Title>
+    <Version>1.3.0</Version>
     <PackageProjectUrl>https://github.com/ReferenceType/H264Sharp</PackageProjectUrl>
     <Authors>ReferenceType</Authors>
     <RepositoryUrl>https://github.com/ReferenceType/H264Sharp</RepositoryUrl>
     <PackageTags>h264;openh264;transcoder;h264sharp</PackageTags>
     <PackageReleaseNotes>https://github.com/ReferenceType/H264Sharp/releases/</PackageReleaseNotes>
-    <PackageId>H264Sharp</PackageId>
+    <PackageId>H264Sharp-linux</PackageId>
     <Description>Cisco's OpenH264 wrapper for .Net with SIMD color model conversion support</Description>
 
     <Copyright></Copyright>
@@ -24,18 +39,56 @@
 
 </PropertyGroup>
 
-<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-  <DefineConstants>$(DefineConstants);OS_WINDOWS</DefineConstants>
-</PropertyGroup>  
 
-
 
+  <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
+    <DefineConstants>OS_WINDOWS</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Linux'))">
+    <DefineConstants>OS_LINUX</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('FreeBSD'))">
+    <DefineConstants>OS_FREEBSD</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('OSX'))">
+    <DefineConstants>OS_MAC</DefineConstants>
+  </PropertyGroup>
+
+
   <ItemGroup>
-    <Content Include="runtimes\win-x64\native\*" CopyToOutputDirectory="Always" Pack="true" PackagePath="\lib\$(TargetFramework)" />
-    <Content Include="runtimes\linux64\native\*" CopyToOutputDirectory="Always" Pack="true" PackagePath="\lib\$(TargetFramework)" />
 
-    <Content Include="runtimes\win-x86\native\*" CopyToOutputDirectory="Always" Pack="true" PackagePath="\lib\$(TargetFramework)" />
-    <Content Include="runtimes\linux86\native\*" CopyToOutputDirectory="Always" Pack="true" PackagePath="\lib\$(TargetFramework)" />
+    <Content Include="runtimes\win-x64\native\*" CopyToOutputDirectory="Always" PackageCopyToOutput="true" Pack="true" PackagePath="\lib\netstandard2.0" />
+    <Content Include="runtimes\win-x64\native\*" CopyToOutputDirectory="Always" PackageCopyToOutput="true" Pack="true" PackagePath="\lib\net8.0" />
+    <Content Include="runtimes\linux64\native\*" CopyToOutputDirectory="Always" PackageCopyToOutput="true" Pack="true" PackagePath="/contentFiles/any/any/" />
+    <None Include="runtimes\linux64\native\H264SharpNative-linux64.so">
+      <Pack>true</Pack>
+      <PackageCopyToOutput>true</PackageCopyToOutput>
+      <PackageFlatten>true</PackageFlatten>
+      <PackagePath>contentFiles\any\asset;content\any\asset</PackagePath>
+    </None>
+    <None Include="runtimes\linux64\native\libopenh264-2.4.1-linux64.7.so">
+      <Pack>true</Pack>
+      <PackageCopyToOutput>true</PackageCopyToOutput>
+      <PackageFlatten>true</PackageFlatten>
+      <PackagePath>contentFiles\any\asset;content\any\asset</PackagePath>
+    </None>
+    <Content Include="runtimes\win-x86\native\*" CopyToOutputDirectory="Always" PackageCopyToOutput="true" Pack="true" PackagePath="\lib\netstandard2.0" />
+    <Content Include="runtimes\win-x86\native\*" CopyToOutputDirectory="Always" PackageCopyToOutput="true" Pack="true" PackagePath="\lib\net8.0" />
+    <Content Include="runtimes\linux86\native\*" CopyToOutputDirectory="Always" PackageCopyToOutput="true" Pack="true" PackagePath="/contentFiles/any/any/" />
+    <!--<Content Include="runtimes\linux86\native\*"  CopyToOutputDirectory="Always"  PackageCopyToOutput="true" Pack="true" PackagePath="\lib\net8.0" />-->
+  </ItemGroup>
+
+
+  <ItemGroup>
+    <Content Remove="runtimes\linux64\native\H264SharpNative-linux64.so" />
+    <Content Remove="runtimes\linux64\native\libopenh264-2.4.1-linux64.7.so" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="..\Resources\Licence.txt">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
   </ItemGroup>
 
   <ItemGroup>
@@ -48,3 +101,4 @@
 
 
 </Project>
+
diff --git a/H264Sharp/Publish.zip b/H264Sharp/Publish.zip
diff --git a/H264Sharp/runtimes/linux64/native/H264SharpNative-linux64.so b/H264Sharp/runtimes/linux64/native/H264SharpNative-linux64.so
diff --git a/H264Sharp/runtimes/win-x64/native/H264SharpNative-win64.dll b/H264Sharp/runtimes/win-x64/native/H264SharpNative-win64.dll
diff --git a/H264Sharp/runtimes/win-x86/native/H264SharpNative-win32.dll b/H264Sharp/runtimes/win-x86/native/H264SharpNative-win32.dll
diff --git a/H264SharpNative/CMakeLists.txt b/H264SharpNative/CMakeLists.txt
@@ -27,6 +27,8 @@ else()
     set(CMAKE_CXX_COMPILER "clang-cl")
 endif()
 
+#H264SharpNative-linux64.so
+
 # Add source to this project's executable.
 #add_executable (CMakeProject1 "CMakeProject1.cpp" "CMakeProject1.h")
 add_library (CMakeProject1 SHARED 
@@ -52,5 +54,8 @@ add_library (CMakeProject1 SHARED
 if (CMAKE_VERSION VERSION_GREATER 3.12)
   set_property(TARGET CMakeProject1 PROPERTY CXX_STANDARD 20)
 endif()
-
+set_target_properties(CMakeProject1 PROPERTIES PREFIX "")
+set_target_properties(CMakeProject1 PROPERTIES OUTPUT_NAME "H264SharpNative-linux64")
+set_target_properties(CMakeProject1 PROPERTIES SUFFIX ".so")
+#set_target_properties(CMakeProject1 PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
 # TODO: Add tests and install targets if needed.
diff --git a/H264SharpNative/ConverterLocal.h b/H264SharpNative/ConverterLocal.h
@@ -1,6 +1,5 @@
 #ifndef CONVERTER_LOCAL
 #define CONVERTER_LOCAL
-#include <cmath>
 #include<stdint.h>
 #ifndef __arm__
 #include <emmintrin.h>

diff --git a/H264SharpNative/H264SharpNative.vcxproj b/H264SharpNative/H264SharpNative.vcxproj
@@ -153,7 +153,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;_DEBUG;H264SHARPNATIVE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
     </ClCompile>
     <Link>
@@ -170,7 +170,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;NDEBUG;H264SHARPNATIVE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
       <Optimization>Full</Optimization>

diff --git a/H264Sharp/Licence.txt → Resources/Licence.txt b/H264Sharp/Licence.txt → Resources/Licence.txt