If all goes well, then for MSVC this is the final commit for C++20, C…

…Make, and dependencies.
eden-protocol · Mar 16, 2021 · b0ec1b5 · b0ec1b5
1 parent d50a062
commit b0ec1b5
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 28 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,15 +1,3 @@
-[submodule "extern/curl"]
-    path = extern/curl
-    url = https://github.com/curl/curl.git
-[submodule "extern/stb"]
-	path = extern/stb
-	url = https://github.com/nothings/stb.git
-[submodule "extern/tinyobjloader-c"]
-	path = extern/tinyobjloader-c
-	url = https://github.com/syoyo/tinyobjloader-c.git
-[submodule "extern/Vulkan-Headers"]
-	path = extern/Vulkan-Headers
-	url = https://github.com/KhronosGroup/Vulkan-Headers.git
 [submodule "extern/Nac-RmlUi"]
 	path = extern/Nac-RmlUi
 	url = https://github.com/WatIsDeze/Nac-RmlUi
@@ -19,3 +7,15 @@
 [submodule "extern/NaC-SDL"]
 	path = extern/NaC-SDL
 	url = https://github.com/WatIsDeze/NaC-SDL
+[submodule "extern/Vulkan-Headers"]
+	path = extern/Vulkan-Headers
+	url = https://github.com/KhronosGroup/Vulkan-Headers
+[submodule "extern/NaC-curl"]
+	path = extern/NaC-curl
+	url = https://github.com/WatIsDeze/NaC-curl
+[submodule "extern/tinyobjloader-c"]
+	path = extern/tinyobjloader-c
+	url = https://github.com/syoyo/tinyobjloader-c.git
+[submodule "extern/stb"]
+	path = extern/stb
+	url = https://github.com/nothings/stb.git
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
@@ -53,7 +53,7 @@ if(CONFIG_USE_CURL)
 
     set(ZLIB_DIR "{CMAKE_CURRENT_SOURCE_DIR}/zlib")
 
-    add_subdirectory(curl)
+    add_subdirectory(NaC-curl)
 
     set_target_properties(libcurl PROPERTIES FOLDER extern)
 endif()

diff --git a/extern/NaC-curl b/extern/NaC-curl
diff --git a/extern/curl b/extern/curl
diff --git a/inc/common/msg.h b/inc/common/msg.h
@@ -190,7 +190,7 @@ void    MSG_ShowDeltaEntityBits(int bits);
 void    MSG_ShowDeltaPlayerstateBits_Packet(int flags);
 const char *MSG_ServerCommandString(int cmd);
 #define MSG_ShowSVC(cmd) \
-    Com_LPrintf(PRINT_DEVELOPER, "%3"PRIz":%s\n", msg_read.readcount - 1, \
+    Com_LPrintf(PRINT_DEVELOPER, "%3" PRIz ":%s\n", msg_read.readcount - 1, \
         MSG_ServerCommandString(cmd))
 #endif // USE_CLIENT || USE_MVD_CLIENT
 #endif // _DEBUG

diff --git a/inc/shared/shared.h b/inc/shared/shared.h
@@ -502,9 +502,9 @@ static inline float FloatSwap(float f)
      (b)[2]=LittleFloat((a)[2]))
 
 #if USE_BGRA
-#define MakeColor(r, g, b, a)   MakeRawLong(b, g, r, a)
+#define MakeColor(r, g, b, a)   (const uint32_t)MakeRawLong(b, g, r, a)
 #else
-#define MakeColor(r, g, b, a)   MakeRawLong(r, g, b, a)
+#define MakeColor(r, g, b, a)   (const uint32_t)MakeRawLong(r, g, b, a)
 #endif
 
 //=============================================

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -548,7 +548,7 @@ ENDIF()
 
 IF(CONFIG_ENABLE_RMLUI)
  	TARGET_SOURCES(client PRIVATE ${SRC_CLIENT_RMLUI})
-	TARGET_INCLUDE_DIRECTORIES(client PRIVATE ${CMAKE_SOURCE_DIR}/extern/RmlUi/Include/)
+	TARGET_INCLUDE_DIRECTORIES(client PRIVATE ${CMAKE_SOURCE_DIR}/extern/Nac-RmlUi/Include/)
 	TARGET_COMPILE_DEFINITIONS(client PRIVATE USE_RMLUI=1 RMLUI_STATIC_LIB)
 	TARGET_LINK_LIBRARIES(client RmlCore RmlDebugger RmlLua)
 ENDIF()
@@ -626,6 +626,8 @@ TARGET_INCLUDE_DIRECTORIES(client PRIVATE "${ZLIB_INCLUDE_DIRS}")
 TARGET_INCLUDE_DIRECTORIES(server PRIVATE ../inc)
 TARGET_INCLUDE_DIRECTORIES(server PRIVATE "${ZLIB_INCLUDE_DIRS}")
 
+TARGET_INCLUDE_DIRECTORIES(client PRIVATE "/extern/stb/")
+
 # WATISDEZE: Do we still need this?
 # Use dynamic zlib for steam runtime
 # if (CONFIG_LINUX_STEAM_RUNTIME_SUPPORT)

diff --git a/src/client/rmlui/librmlui.h b/src/client/rmlui/librmlui.h
@@ -12,7 +12,7 @@
 //#define RMLUI_STATIC_LIB
 
 // RmlUI.
-#include <RmlUi/Core/Core.h>
+#include "RmlUi/Core/Core.h"
 #include <RmlUi/Core/Context.h>
 #include <RmlUi/Core/ElementDocument.h>
 #include <RmlUi/Core/Input.h>

diff --git a/src/refresh/vkpt/tone_mapping.cpp b/src/refresh/vkpt/tone_mapping.cpp
@@ -314,12 +314,12 @@ vkpt_tone_mapping_record_cmd_buffer(VkCommandBuffer cmd_buf, float frame_time)
 	// in global_ubo.h will override this.
 	float slope_blur_sigma = Cvar_Get("tm_slope_blur_sigma", "6.0", 0)->value;
 	float push_constants_tm2_curve[16] = {
-		 reset_required ? 1.0 : 0.0, // 1 means reset the histogram
+		 reset_required ? 1.0f : 0.0f, // 1 means reset the histogram
 		 frame_time, // Frame time
-		 0.0, 0.0, 0.0, 0.0, // Slope kernel filter
-		 0.0, 0.0, 0.0, 0.0,
-		 0.0, 0.0, 0.0, 0.0,
-		 0.0, 0.0
+		 0.0f, 0.0f, 0.0f, 0.0f, // Slope kernel filter
+		 0.0f, 0.0f, 0.0f, 0.0f,
+		 0.0f, 0.0f, 0.0f, 0.0f,
+		 0.0f, 0.0f
 	};
 
 	// Compute Gaussian curve and sum, taking symmetry into account.

diff --git a/src/svgame/save.cpp b/src/svgame/save.cpp
@@ -242,7 +242,7 @@ static const save_field_t entityfields[] = {
     I(monsterinfo.power_armor_type),
     I(monsterinfo.power_armor_power),
 
-    {0}
+    {(fieldtype_t)0}
 #undef _OFS
 };
 
@@ -285,7 +285,7 @@ static const save_field_t levelfields[] = {
 
     I(power_cubes),
 
-    {0}
+    {(fieldtype_t)0}
 #undef _OFS
 };
 
@@ -406,7 +406,7 @@ static const save_field_t clientfields[] = {
 
     F(pickup_msg_time),
 
-    {0}
+    {(fieldtype_t)0}
 #undef _OFS
 };
 
@@ -424,7 +424,7 @@ static const save_field_t gamefields[] = {
 
     I(autosaved),
 
-    {0}
+    {(fieldtype_t)0}
 #undef _OFS
 };