- Variable Init was wrong for Windows compiler

- Improved CMakeLists.txt - Update submodule (CMakeLists.txt of submodules) - Added missing library to vcproj
Tomenz · Nov 13, 2024 · d3274be · d3274be
1 parent cae0709
commit d3274be
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,11 +9,12 @@ enable_language(CXX)
 
 ADD_DEFINITIONS(-DUNICODE)
 ADD_DEFINITIONS(-D_UNICODE)
-if (MSVC)
+if (WIN32)
     # Turn off Microsofts "security" warnings.
     add_compile_definitions(_CRT_SECURE_NO_WARNINGS _CONSOLE _SCL_SECURE_NO_WARNINGS NOGDICAPMASKS NOVIRTUALKEYCODES NOWINMESSAGES NOWINSTYLES NOSYSMETRICS NOMENUS NOICONS NOKEYSTATES NOSYSCOMMANDS NORASTEROPS NOSHOWWINDOW OEMRESOURCE NOATOM NOCLIPBOARD NOCOLOR NOCTLMGR NODRAWTEXT NOGDI NOKERNEL NOUSER NONLS NOMB NOMEMMGR NOMETAFILE NOMINMAX NOMSG NOOPENFILE NOSCROLL NOSOUND NOTEXTMETRIC NOWH NOWINOFFSETS NOCOMM NOKANJI NOHELP NOPROFILER NODEFERWINDOWPOS NOMCX)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHa")
-    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+    #set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded")
     add_compile_options("/EHa")
 else()
     SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -ggdb -D_DEBUG -DDEBUG")

diff --git a/FastCgi b/FastCgi
diff --git a/Http2Serv.vcxproj b/Http2Serv.vcxproj
@@ -172,14 +172,15 @@
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(SolutionDir);brotli\c\include</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <LanguageStandard>stdcpp14</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>x64\Release;$(OpenSSL_Home)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>CommonLib.lib;socketlib64.lib;brotli.lib;zlib.lib;libcrypto.lib;libssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CommonLib.lib;socketlib64.lib;brotli.lib;zlib.lib;libcrypto.lib;libssl.lib;SrvLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>copy "$(SolutionDir)$(PlatForm)\$(Configuration)\$(ProjectName)\$(TargetFileName)" "$(SolutionDir)$(TargetFileName)"</Command>

diff --git a/SocketLib b/SocketLib
diff --git a/SpawnProcess.cpp b/SpawnProcess.cpp
@@ -42,7 +42,7 @@ mutex SpawnProcess::s_mtxIOstreams;
 SpawnProcess::SpawnProcess() : m_fdStdOutPipe{-1,-1}, m_fdStdInPipe{-1,-1}, m_fdStdErrPipe{-1,-1}
 {
 #if defined(_WIN32) || defined(_WIN64)
-    m_hProcess{INVALID_HANDLE_VALUE};
+    m_hProcess = INVALID_HANDLE_VALUE;
 #endif
 
     char** aszEnv {_environ};

diff --git a/SrvLib b/SrvLib
+0 −9		.travis.yml
+11 −12		CMakeLists.txt
+0 −1		README.md
+3 −0		ServMain.cpp