- what the fuck GCC

Author: SoapyMan

.appveyor/Build.sh

@@ -3,7 +3,7 @@ set -ex
 
 cd "$APPVEYOR_BUILD_FOLDER"
 
-./premake5 gmake2
+./premake5 gmake2 verbose
 
 for config in debug release
 do

Driver2CutsceneTool/cutscene_tool.cpp

@@ -1,14 +1,14 @@
-#include <math.h>
-
+#include <stdlib.h>
+#include <stdio.h>
 #include <malloc.h>
-#include "core/VirtualStream.h"
 #include "core/cmdlib.h"
-#include "math/dktypes.h"
-#include "util/image.h"
-#include "util/util.h"
-#include <string>
+#include "core/dktypes.h"
+#include <string.h>
+#include <nstd/Directory.hpp>
+#include <nstd/File.hpp>
+#include <nstd/String.hpp>
 
-#include <DriverLevelTool/driver_routines/d2_types.h>
+#include "math/psx_math_types.h"
 
 #define MAX_FILE_CUTSCENES			15
 #define REPLAY_BUFFER_MINSIZE		2280
@@ -166,13 +166,10 @@ struct REPLAY_STREAM_HEADER
 void UnpackCutsceneFile(const char* filename)
 {
 	// replace extension with .den
-	std::string cut_name = filename;
-
-	size_t str_idx = cut_name.find_last_of(".");
-	cut_name = cut_name.substr(0, str_idx);
+	String cut_name = String::fromCString(filename);
+	cut_name = File::basename(cut_name, File::extension(cut_name));
 
 	char* buffer;
-	char folderPath[512];
 
 	CUTSCENE_HEADER header;
 	FILE* fp = fopen(filename, "rb");
@@ -189,8 +186,8 @@ void UnpackCutsceneFile(const char* filename)
 	Msg("Max replay buffer size: %d\n", header.maxsize);
 
 	// make the folder
-	sprintf(folderPath, "%s", cut_name.c_str());
-	mkdirRecursive(folderPath, true);
+	String folderPath = cut_name;
+	Directory::create(folderPath);
 
 	buffer = (char*)malloc(0x200000);
 
@@ -236,9 +233,7 @@ void UnpackCutsceneFile(const char* filename)
 		}
 
 		// save separate file
-		sprintf(folderPath, "%s/%s_%d.D2RP", cut_name.c_str(), cut_name.c_str(), i);
-
-		FILE* wp = fopen(folderPath, "wb");
+		FILE* wp = fopen(String::fromPrintf("%s/%s_%d.D2RP", (char*)cut_name, (char*)cut_name, i), "wb");
 		if (wp)
 		{
 			MsgWarning("\tSaving '%s', at %d, %d bytes\n", folderPath, header.data[i].offset, header.data[i].size);
@@ -256,7 +251,6 @@ void PackCutsceneFile(const char* foldername)
 {
 	int offset;
 	char* buffer;
-	char folderPath[512];
 	CUTSCENE_HEADER header;
 	header.maxsize = REPLAY_BUFFER_MINSIZE;
 
@@ -269,8 +263,8 @@ void PackCutsceneFile(const char* foldername)
 
 	for (int i = 0; i < MAX_FILE_CUTSCENES; i++)
 	{
-		sprintf(folderPath, "%s/%s_%d.D2RP", foldername, foldername, i);
-		FILE* fp = fopen(folderPath, "rb");
+		String folderPath = String::fromPrintf("%s/%s_%d.D2RP", foldername, foldername, i);
+		FILE* fp = fopen(String::fromPrintf("%s/%s_%d.D2RP", foldername, foldername, i), "rb");
 		if (fp)
 		{
 			if (i == 0)
@@ -294,7 +288,7 @@ void PackCutsceneFile(const char* foldername)
 			replays[i] = (char*)malloc(size);
 			repsizes[i] = size;
 
-			MsgWarning("\tLoaded '%s', %d bytes\n", folderPath, size);
+			MsgWarning("\tLoaded '%s', %d bytes\n", (char*)folderPath, size);
 			fread(replays[i], 1, size, fp);
 			fclose(fp);
 
@@ -327,7 +321,7 @@ void PackCutsceneFile(const char* foldername)
 
 				// shrink size
 				repsizes[i] -= sizeof(PLAYBACKCAMERA) * MAX_REPLAY_CAMERAS;
-				MsgAccept("\tShrinking '%s', now %d bytes\n", folderPath, repsizes[i]);
+				MsgAccept("\tShrinking '%s', now %d bytes\n", (char*)folderPath, repsizes[i]);
 			}
 		}
 		else
@@ -359,15 +353,16 @@ void PackCutsceneFile(const char* foldername)
 		MsgWarning("No chase replays\n");
 	}
 
-	sprintf(folderPath, "%s_N.R", foldername);
+	String folderPath = String::fromPrintf("%s_N.R", foldername);
+
 	FILE* wp = fopen(folderPath, "wb");
 
 	if (!wp)
 	{
 		for (int i = 0; i < MAX_FILE_CUTSCENES; i++)
 			free(replays[i]);
 
-		MsgError("Unable to save '%s'\n", folderPath);
+		MsgError("Unable to save '%s'\n", (char*)folderPath);
 		return;
 	}
 

Driver2CutsceneTool/premake5.lua

@@ -7,10 +7,10 @@ project "Driver2CutsceneTool"
     targetdir "bin/%{cfg.buildcfg}"
 
 	-- framework link
-	dependson { "frameworkLib" }
-	links { "frameworkLib" }
+	dependson { "frameworkLib", "libnstd" }
+	links { "frameworkLib", "libnstd" }
 	includedirs {
-		"dependencies/libnstd/include",
+		"../dependencies/libnstd/include",
 	}
 	--
 

Driver2MissionTool/mission_tool.cpp

@@ -1,14 +1,7 @@
-#include <math.h>
+#include <stdlib.h>
+#include <string.h>
 
-#include <malloc.h>
-#include "core/VirtualStream.h"
 #include "core/cmdlib.h"
-#include "math/dktypes.h"
-#include "util/image.h"
-#include "util/util.h"
-#include <string>
-#include <DriverLevelTool/driver_routines/d2_types.h>
-
 //----------------------------------------------------
 
 void CompileMissionBlk(const char* filename)

Driver2MissionTool/premake5.lua

@@ -3,14 +3,13 @@
 project "Driver2MissionTool"
     kind "ConsoleApp"
     language "C++"
-    compileas "C++"
     targetdir "bin/%{cfg.buildcfg}"
 
 	-- framework link
-	dependson { "frameworkLib" }
-	links { "frameworkLib" }
+	dependson { "frameworkLib", "libnstd" }
+	links { "frameworkLib", "libnstd" }
 	includedirs {
-		"dependencies/libnstd/include",
+		"../dependencies/libnstd/include",
 	}
 	--
 

DriverImageTool/image_tool.cpp

@@ -3,10 +3,12 @@
 #include <malloc.h>
 #include "core/VirtualStream.h"
 #include "core/cmdlib.h"
-#include "math/dktypes.h"
+#include "core/dktypes.h"
 #include "util/image.h"
 #include "util/util.h"
 
+#include <string.h>
+
 struct RECT16
 {
 	short x, y, w, h;

DriverImageTool/premake5.lua

@@ -7,10 +7,10 @@ project "DriverImageTool"
     targetdir "bin/%{cfg.buildcfg}"
 
 	-- framework link
-	dependson { "frameworkLib" }
-	links { "frameworkLib" }
+	dependson { "frameworkLib", "libnstd" }
+	links { "frameworkLib", "libnstd" }
 	includedirs {
-		"dependencies/libnstd/include",
+		"../dependencies/libnstd/include",
 	}
 	--
 

DriverLevelTool/driver_level.cpp

@@ -1,4 +1,7 @@
 #include "driver_level.h"
+
+#include <string.h>
+
 #include "core/cmdlib.h"
 #include "core/VirtualStream.h"
 

DriverLevelTool/driver_routines/d2_types.h

@@ -1,7 +1,7 @@
 #ifndef D2_TYPES
 #define D2_TYPES
 
-#include "math/dktypes.h"
+#include "core/dktypes.h"
 #include "math/psx_math_types.h"
 
 #define TEXPAGE_SIZE_X	(128)

DriverLevelTool/driver_routines/level.cpp

@@ -1,4 +1,5 @@
-#include "math/dktypes.h"
+#include "core/dktypes.h"
+#include "core/cmdlib.h"
 #include "core/VirtualStream.h"
 
 #include <nstd/String.hpp>
@@ -10,6 +11,7 @@
 
 #include "level.h"
 
+
 //--------------------------------------------------------------------------------------------------------------------------
 
 char*						g_overlayMapData = nullptr;