From f9bc90d009d7c96d97e4bfa7a5679e01dddd5dfd Mon Sep 17 00:00:00 2001 From: Aki Date: Tue, 28 Sep 2021 21:51:34 +0200 Subject: Created best-guess cmake stubs Structure of the project as whole is... questionable. It looks that the directories are intermingled even if they appear separated. This is a first guess to have at least something in place. --- NetEx/CMakeLists.txt | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 NetEx/CMakeLists.txt (limited to 'NetEx') diff --git a/NetEx/CMakeLists.txt b/NetEx/CMakeLists.txt new file mode 100644 index 0000000..8cf742e --- /dev/null +++ b/NetEx/CMakeLists.txt @@ -0,0 +1,23 @@ +project(NetEx) +add_library( + NetEx + STATIC + HttpClient.cpp + HttpServer.cpp + HttpServlet.cpp + HttpServletExec.cpp + NetAddr.cpp + NetClient.cpp + NetGram.cpp + NetHost.cpp + NetLayer.cpp + NetLink.cpp + NetMsg.cpp + NetPeer.cpp + NetServer.cpp + NetSock.cpp + ) +target_include_directories( + NetEx + PUBLIC . + ) -- cgit v1.1 From be0a9e251a9c217ce49ac84c3ad6e5383b2d3f4a Mon Sep 17 00:00:00 2001 From: Aki Date: Tue, 28 Sep 2021 22:39:53 +0200 Subject: Added missing FoundationEx dependencies --- NetEx/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'NetEx') diff --git a/NetEx/CMakeLists.txt b/NetEx/CMakeLists.txt index 8cf742e..553ab30 100644 --- a/NetEx/CMakeLists.txt +++ b/NetEx/CMakeLists.txt @@ -21,3 +21,7 @@ target_include_directories( NetEx PUBLIC . ) +target_link_libraries( + NetEx + PUBLIC FoundationEx + ) -- cgit v1.1 From 545889c990d9155635dfca73345be37f207b2d68 Mon Sep 17 00:00:00 2001 From: Aki Date: Thu, 30 Sep 2021 16:49:25 +0200 Subject: Fixed NetEx includes against win sdk --- NetEx/CMakeLists.txt | 4 +++- NetEx/NetAddr.h | 1 + NetEx/NetLayer.h | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) (limited to 'NetEx') diff --git a/NetEx/CMakeLists.txt b/NetEx/CMakeLists.txt index 553ab30..ccb0f01 100644 --- a/NetEx/CMakeLists.txt +++ b/NetEx/CMakeLists.txt @@ -17,9 +17,11 @@ add_library( NetServer.cpp NetSock.cpp ) +set(WINDOWSSDK_PATH "C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/um") target_include_directories( NetEx - PUBLIC . + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} + PUBLIC ${WINDOWSSDK_PATH} # FIXME ) target_link_libraries( NetEx diff --git a/NetEx/NetAddr.h b/NetEx/NetAddr.h index 58e6b9c..32e01c9 100644 --- a/NetEx/NetAddr.h +++ b/NetEx/NetAddr.h @@ -41,6 +41,7 @@ #define NetAddr_h #include +#include // +-------------------------------------------------------------------+ diff --git a/NetEx/NetLayer.h b/NetEx/NetLayer.h index 66b9c9d..49c884e 100644 --- a/NetEx/NetLayer.h +++ b/NetEx/NetLayer.h @@ -40,6 +40,7 @@ #define NetLayer_h #include +#include #include "Text.h" // +-------------------------------------------------------------------+ -- cgit v1.1 From 32e4ab1e55fbb39930836e7c8734d9217cc36272 Mon Sep 17 00:00:00 2001 From: Aki Date: Fri, 1 Oct 2021 18:58:49 +0200 Subject: Removed vs left-overs --- NetEx/NetEx.vcxproj | 582 -------------------------------------------- NetEx/NetEx.vcxproj.filters | 107 -------- 2 files changed, 689 deletions(-) delete mode 100644 NetEx/NetEx.vcxproj delete mode 100644 NetEx/NetEx.vcxproj.filters (limited to 'NetEx') diff --git a/NetEx/NetEx.vcxproj b/NetEx/NetEx.vcxproj deleted file mode 100644 index 020eb22..0000000 --- a/NetEx/NetEx.vcxproj +++ /dev/null @@ -1,582 +0,0 @@ - - - - - Debug VS2012 - Win32 - - - Debug VS2012 - x64 - - - Debug x64 - Win32 - - - Debug x64 - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release VS2012 - Win32 - - - Release VS2012 - x64 - - - Release x64 - Win32 - - - Release x64 - x64 - - - Release - Win32 - - - Release - x64 - - - Template - Win32 - - - Template - x64 - - - - - - {574D6A73-F38F-30E0-0F30-64AD0378B426} - 10.0.16299.0 - - - - Application - v141 - - - Application - v141 - - - StaticLibrary - false - MultiByte - v141 - - - StaticLibrary - false - MultiByte - v141 - - - StaticLibrary - false - MultiByte - v141 - - - StaticLibrary - false - MultiByte - v141 - - - StaticLibrary - false - MultiByte - v141 - - - StaticLibrary - false - MultiByte - v141 - - - StaticLibrary - false - MultiByte - v141 - - - StaticLibrary - false - MultiByte - v141 - - - StaticLibrary - false - MultiByte - v141 - - - StaticLibrary - false - MultiByte - v141 - - - v141 - - - v141 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .\Debug\ - .\Debug\ - - - .\Debug\ - .\Debug\ - - - .\Debug\ - .\Debug\ - - - .\Debug\ - .\Debug\ - - - .\Release\ - .\Release\ - - - .\Release\ - .\Release\ - - - .\Release\ - .\Release\ - - - .\Release\ - .\Release\ - - - .\Release\ - .\Release\ - - - .\Release\ - .\Release\ - - - - MultiThreadedDebug - Default - false - Disabled - true - Level3 - false - ProgramDatabase - ../FoundationEx;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_LIB;SYNC_THREADS;%(PreprocessorDefinitions) - .\Debug\ - .\Debug\NetEx.pch - .\Debug\ - .\Debug\ - EnableFastChecks - true - - - 0x0409 - _DEBUG;%(PreprocessorDefinitions) - - - true - .\Debug\NetEx.bsc - - - true - .\Debug\NetEx.lib - - - - - MultiThreadedDebug - Default - false - Disabled - true - Level3 - false - ProgramDatabase - ../FoundationEx;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_LIB;SYNC_THREADS;%(PreprocessorDefinitions) - .\Debug\ - .\Debug\NetEx.pch - .\Debug\ - .\Debug\ - EnableFastChecks - true - - - 0x0409 - _DEBUG;%(PreprocessorDefinitions) - - - true - .\Debug\NetEx.bsc - - - true - .\Debug\NetEx.lib - - - - - MultiThreadedDebug - Default - false - Disabled - true - Level3 - ProgramDatabase - ../FoundationEx;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_LIB;SYNC_THREADS;%(PreprocessorDefinitions) - .\Debug\ - .\Debug\NetEx.pch - .\Debug\ - .\Debug\ - EnableFastChecks - - - 0x0409 - _DEBUG;%(PreprocessorDefinitions) - - - true - .\Debug\NetEx.bsc - - - true - .\Debug\NetEx.lib - - - - - MultiThreadedDebug - Default - false - Disabled - true - Level3 - ProgramDatabase - ../FoundationEx;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_LIB;SYNC_THREADS;%(PreprocessorDefinitions) - .\Debug\ - .\Debug\NetEx.pch - .\Debug\ - .\Debug\ - EnableFastChecks - - - 0x0409 - _DEBUG;%(PreprocessorDefinitions) - - - true - .\Debug\NetEx.bsc - - - true - .\Debug\NetEx.lib - - - - - MultiThreaded - OnlyExplicitInline - true - false - MaxSpeed - true - Level3 - ../FoundationEx;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_LIB;SYNC_THREADS;%(PreprocessorDefinitions) - .\Release\ - .\Release\NetEx.pch - .\Release\ - .\Release\ - true - - - 0x0409 - NDEBUG;%(PreprocessorDefinitions) - - - true - .\Release\NetEx.bsc - - - true - .\Release\NetEx.lib - - - - - MultiThreaded - OnlyExplicitInline - true - false - MaxSpeed - true - Level3 - ../FoundationEx;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_LIB;SYNC_THREADS;%(PreprocessorDefinitions) - .\Release\ - .\Release\NetEx.pch - .\Release\ - .\Release\ - true - - - 0x0409 - NDEBUG;%(PreprocessorDefinitions) - - - true - .\Release\NetEx.bsc - - - true - .\Release\NetEx.lib - - - - - MultiThreaded - OnlyExplicitInline - true - false - MaxSpeed - true - Level3 - ../FoundationEx;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_LIB;SYNC_THREADS;%(PreprocessorDefinitions) - .\Release\ - .\Release\NetEx.pch - .\Release\ - .\Release\ - true - - - 0x0409 - NDEBUG;%(PreprocessorDefinitions) - - - true - .\Release\NetEx.bsc - - - true - .\Release\NetEx.lib - - - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - ../FoundationEx;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_LIB;SYNC_THREADS;%(PreprocessorDefinitions) - .\Release\ - .\Release\NetEx.pch - .\Release\ - .\Release\ - - - 0x0409 - NDEBUG;%(PreprocessorDefinitions) - - - true - .\Release\NetEx.bsc - - - true - .\Release\NetEx.lib - - - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - ../FoundationEx;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_LIB;SYNC_THREADS;%(PreprocessorDefinitions) - .\Release\ - .\Release\NetEx.pch - .\Release\ - .\Release\ - - - 0x0409 - NDEBUG;%(PreprocessorDefinitions) - - - true - .\Release\NetEx.bsc - - - true - .\Release\NetEx.lib - - - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - ../FoundationEx;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_LIB;SYNC_THREADS;%(PreprocessorDefinitions) - .\Release\ - .\Release\NetEx.pch - .\Release\ - .\Release\ - - - 0x0409 - NDEBUG;%(PreprocessorDefinitions) - - - true - .\Release\NetEx.bsc - - - true - .\Release\NetEx.lib - - - - - true - false - - - - - true - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/NetEx/NetEx.vcxproj.filters b/NetEx/NetEx.vcxproj.filters deleted file mode 100644 index 7801820..0000000 --- a/NetEx/NetEx.vcxproj.filters +++ /dev/null @@ -1,107 +0,0 @@ - - - - - {f368c362-33c9-4cf0-897f-25cd35c75ddb} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {fe3ab52e-099a-4f2f-a496-d7d42f337ab5} - h;hpp;hxx;hm;inl - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file -- cgit v1.1