cmake, eCAL

.gitignore

@@ -4,3 +4,6 @@ build/
 escapi.opensdf
 escapi.sdf
 /target/*
+
+bld/
+.vs/

CMakeLists.txt

@@ -0,0 +1,53 @@
+cmake_minimum_required(VERSION 3.0)
+set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ON)
+
+project(webcam)
+
+#set(CMAKE_BUILD_TYPE "Release")
+#set(CMAKE_CXX_FLAGS "-std=c++14")
+#set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wall -g")
+
+#set(CMAKE_CXX_STANDARD 14)
+#set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+if (MSVC)
+  set(CMAKE_CXX_STANDARD 11)             # needed for eCAL
+  set(CMAKE_CXX_STANDARD_REQUIRED ON)    # needed for eCAL
+endif()
+
+# find packages and ... a bit ugly ... set directories by hand, all lib-packages are in c:\lib
+
+set (SDL2_DIR C:/lib/SDL2-2.30.11/cmake)
+find_package(SDL2 REQUIRED)
+find_package(OpenGL REQUIRED)
+
+# hmmm, eCAL build stopped working --> zlib installed from https://gnuwin32.sourceforge.net/packages/zlib.htm --> Complete package
+set(ZLIB_LIBRARY C:/lib/zlib/lib)
+set(ZLIB_INCLUDE_DIR C:/lib/zlib/include)
+
+find_package(eCAL REQUIRED)
+find_package(Protobuf REQUIRED)
+
+
+include_directories(
+#  include
+  common
+  ${SDL2_INCLUDE_DIRS}
+  ${OPENGL_INCLUDE_DIRS} // needed by SDL
+)
+
+#link_directories(
+#  include
+#)
+
+# eCAL / proto
+set(protobuf_files
+    ${CMAKE_CURRENT_SOURCE_DIR}/proto/webcam.proto
+)
+add_executable(${PROJECT_NAME} ogl_eCAL/main.cpp common/escapi.cpp)
+
+# compile protos
+PROTOBUF_TARGET_CPP(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/proto/ ${protobuf_files})
+
+
+target_link_libraries(${PROJECT_NAME} ${SDL2_LIBRARIES} ${OPENGL_LIBRARIES} eCAL::core protobuf::libprotobuf)

compileproto.bat

@@ -0,0 +1,2 @@
+mkdir build
+protoc .\proto\* --python_out .\build\ --proto_path .\proto\

escapi.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio Version 17
+VisualStudioVersion = 17.12.35506.116 d17.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "escapi_dll", "escapi_dll\escapi_dll.vcxproj", "{3EF96013-D483-4A34-8599-4B1FE47CAEBE}"
 EndProject
@@ -25,6 +25,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogl", "ogl\ogl.vcxproj", "{
 		{3EF96013-D483-4A34-8599-4B1FE47CAEBE} = {3EF96013-D483-4A34-8599-4B1FE47CAEBE}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogl_eCAL", "ogl_eCAL\ogl_eCAL.vcxproj", "{CC5AE096-EB06-40B9-B32A-275C42DB8E37}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "multicap", "multicap\multicap.vcxproj", "{085B3F2F-1B36-4BCE-8464-81EE5B62589F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{3EF96013-D483-4A34-8599-4B1FE47CAEBE} = {3EF96013-D483-4A34-8599-4B1FE47CAEBE}
@@ -80,6 +82,14 @@ Global
 		{CC5AE096-EB06-40B9-B32A-275C42DB8E36}.Release|Win32.Build.0 = Release|Win32
 		{CC5AE096-EB06-40B9-B32A-275C42DB8E36}.Release|x64.ActiveCfg = Release|x64
 		{CC5AE096-EB06-40B9-B32A-275C42DB8E36}.Release|x64.Build.0 = Release|x64
+		{CC5AE096-EB06-40B9-B32A-275C42DB8E37}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CC5AE096-EB06-40B9-B32A-275C42DB8E37}.Debug|Win32.Build.0 = Debug|Win32
+		{CC5AE096-EB06-40B9-B32A-275C42DB8E37}.Debug|x64.ActiveCfg = Debug|x64
+		{CC5AE096-EB06-40B9-B32A-275C42DB8E37}.Debug|x64.Build.0 = Debug|x64
+		{CC5AE096-EB06-40B9-B32A-275C42DB8E37}.Release|Win32.ActiveCfg = Release|Win32
+		{CC5AE096-EB06-40B9-B32A-275C42DB8E37}.Release|Win32.Build.0 = Release|Win32
+		{CC5AE096-EB06-40B9-B32A-275C42DB8E37}.Release|x64.ActiveCfg = Release|x64
+		{CC5AE096-EB06-40B9-B32A-275C42DB8E37}.Release|x64.Build.0 = Release|x64
 		{085B3F2F-1B36-4BCE-8464-81EE5B62589F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{085B3F2F-1B36-4BCE-8464-81EE5B62589F}.Debug|Win32.Build.0 = Debug|Win32
 		{085B3F2F-1B36-4BCE-8464-81EE5B62589F}.Debug|x64.ActiveCfg = Debug|x64

escapi_dll/escapi_dll.vcxproj

@@ -27,26 +27,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -111,7 +111,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ESCAPI_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\common</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\common;C:\lib\SDL2-2.30.11\include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

escapi_dll/escapi_dll.vcxproj.user

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup />
+</Project>