Merge pull request #3 from c6burns/master

incoming build fixes

CMakeLists.txt

@@ -0,0 +1,60 @@
+#
+# Copyright (c) 2019 Chris Burns <[email protected]>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+
+cmake_minimum_required(VERSION 3.1)
+project(enet LANGUAGES C)
+
+set(ENET_DEBUG OFF CACHE BOOL "Do debug things")
+
+set(ENET_DEFINES -DENET_NO_PRAGMA_LINK -DENET_DLL)
+set(ENET_DEPS "")
+set(ENET_SRCDIR "Source/Native")
+set(ENET_SRCS
+	${ENET_SRCDIR}/enet.c
+	${ENET_SRCDIR}/enet.h
+)
+
+if(ENET_DEBUG)
+    list(APPEND ENET_DEFINES -DENET_DEBUG)
+endif()
+
+if(MSVC)
+	set(CompilerFlags
+        CMAKE_CXX_FLAGS
+        CMAKE_CXX_FLAGS_DEBUG
+        CMAKE_CXX_FLAGS_RELEASE
+        CMAKE_C_FLAGS
+        CMAKE_C_FLAGS_DEBUG
+        CMAKE_C_FLAGS_RELEASE
+    )
+	foreach(CompilerFlag ${CompilerFlags})
+	  string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}")
+	endforeach()
+
+    list(APPEND ENET_DEFINES -D_CRT_SECURE_NO_WARNINGS)
+	list(APPEND ENET_DEPS Ws2_32 Winmm)
+endif()
+
+include_directories(${ENET_SRCDIR})
+add_library(enet SHARED ${ENET_SRCS})
+target_link_libraries(enet ${ENET_DEPS})
+target_compile_definitions(enet PRIVATE ${ENET_DEFINES})

MSBuild/CMake/CMake.Build.targets

@@ -23,11 +23,10 @@ SOFTWARE.
 
     <PropertyGroup>
         <CMakeProjName>enet</CMakeProjName>
-        <CMakeSourceDir>$(SlnDir)Source\Native</CMakeSourceDir>
+        <CMakeSourceDir>$(SlnDir)</CMakeSourceDir>
         <CMakeBinaryDir>$(SlnDir)build_cmake_enet</CMakeBinaryDir>
         <CMakeBuildType Condition="'$(CMakeBuildType)' == ''">Debug</CMakeBuildType>
         <CMakeBuildType Condition="'$(Configuration)' == 'Release'">Release</CMakeBuildType>
-        <CMakeOpts>$(CMakeOpts) -DENET_SHARED=ON</CMakeOpts>
         <CMakeOpts Condition="'$(CMakeBuildType)' == 'Debug'">$(CMakeOpts) -DENET_DEBUG=ON</CMakeOpts>
         <CMakeGenerator></CMakeGenerator>
         <CMakeConfigBuildType></CMakeConfigBuildType>
@@ -35,11 +34,10 @@ SOFTWARE.
 
     <PropertyGroup Condition="'$(OSPlatformWindows)' == 'true'">
         <CMakeVSArch></CMakeVSArch>
-        <CMakeVSArch Condition="'$(Platform)' == 'x64'">Win64</CMakeVSArch>
-		<CMakeVSArch Condition="'$(Platform)' == 'AnyCPU'">Win64</CMakeVSArch>
+        <CMakeVSArch Condition="'$(Platform)' == 'x86'">-A Win32</CMakeVSArch>
         <CMakeVSToolset></CMakeVSToolset>
-        <!--<CMakeVSToolset>-T v141</CMakeVSToolset>-->
-        <CMakeGenerator>-G"Visual Studio 15 2017 $(CMakeVSArch)" $(CMakeVSToolset)</CMakeGenerator>
+        <CMakeVSToolset Condition="'$(BuildingInsideVisualStudio)' != 'true'">-T v141</CMakeVSToolset>
+        <CMakeGenerator>-G"Visual Studio 16 2019" $(CMakeVSArch) $(CMakeVSToolset)</CMakeGenerator>
     </PropertyGroup>
     <PropertyGroup Condition="'$(OSPlatformWindows)' != 'true'">
         <CMakeConfigBuildType>-DCMAKE_BUILD_TYPE=$(CMakeBuildType)</CMakeConfigBuildType>

Source/Native/CMakeLists.txt

@@ -1,10 +1,10 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 2.6)
 project(enet C)
 
-set(ENET_DEBUG OFF CACHE BOOL "Enable debug functionality")
-set(ENET_STATIC OFF CACHE BOOL "Create a static library")
-set(ENET_SHARED OFF CACHE BOOL "Create a shared library")
-set(ENET_LZ4 OFF CACHE BOOL "Add support for an optional packet-level compression")
+set(ENET_DEBUG "0" CACHE BOOL "Enable debug functionality")
+set(ENET_STATIC "0" CACHE BOOL "Create a static library")
+set(ENET_SHARED "0" CACHE BOOL "Create a shared library")
+set(ENET_LZ4 "0" CACHE BOOL "Add support for an optional packet-level compression")
 
 if (ENET_DEBUG)
     add_definitions(-DENET_DEBUG)
@@ -20,7 +20,6 @@ if (ENET_STATIC)
 
     if (WIN32)
         target_link_libraries(enet_static winmm ws2_32)
-		target_compile_definitions(enet PRIVATE _CRT_SECURE_NO_WARNINGS)
         SET_TARGET_PROPERTIES(enet_static PROPERTIES PREFIX "")
     endif()
 endif()
@@ -31,7 +30,6 @@ if (ENET_SHARED)
 
     if (WIN32)
         target_link_libraries(enet winmm ws2_32)
-		target_compile_definitions(enet PRIVATE _CRT_SECURE_NO_WARNINGS)
         SET_TARGET_PROPERTIES(enet PROPERTIES PREFIX "")
     endif()
 endif()