upload changes

Author: Slushi-Github

.github/workflows/linux.yml

@@ -16,8 +16,7 @@ jobs:
 
       - name: Install Haxe libraries
         run: |
-          haxelib --always install hxcpp 
-          haxelib --always install fuzzaldrin
+          haxelib --always install hxcpp
 
       - name: Compile project
         run: haxe build.hxml

.github/workflows/macos.yml

@@ -16,8 +16,7 @@ jobs:
 
       - name: Install Haxe libraries
         run: |
-          haxelib --always install hxcpp 
-          haxelib --always install fuzzaldrin
+          haxelib --always install hxcpp
 
       - name: Compile project
         run: haxe build.hxml

.github/workflows/windows.yml

@@ -16,8 +16,7 @@ jobs:
           haxe-version: 4.3.5
       - name: Installing/Updating libraries
         run: |
-          haxelib --always install hxcpp 
-          haxelib --always install fuzzaldrin 
+          haxelib --always install hxcpp
         shell: cmd
       - name: Building HxCompileU
         run: |

build.hxml

@@ -5,4 +5,3 @@
 --resource templates/makefileSimpleAppWUT@cafeMakefileWUT
 --resource templates/makefileSimpleAppWUPS@cafeMakefileWUPS
 -D message.reporting=pretty
--lib fuzzaldrin

src/JsonFile.hx

@@ -190,22 +190,20 @@ class JsonFile {
 		}
 
 		var defines:String = "";
-		
-		defines += "-D HXCOMPILEU_JSON_VERSION=\"" + jsonFile.programVersion + "\" ";
-		defines += "-D HXCOMPILEU_JSON_WIIU_PROJECTNAME=\"" + jsonFile.wiiuConfig.projectName + "\" ";
+
+		defines += "-D HXCOMPILEU_VERSION=\\\"" + Main.version + "\\\" ";
+		defines += "-D HXCOMPILEU_JSON_WIIU_PROJECTNAME=\\\"" + jsonFile.wiiuConfig.projectName + "\\\" ";
 
 		var dateNow:Date = Date.now();
-		var dateString = dateNow.getHours() + ":" 
-			+ StringTools.lpad(dateNow.getMinutes() + "", "0", 2) + ":" 
-			+ StringTools.lpad(dateNow.getSeconds() + "", "0", 2) + "--" 
-			+ StringTools.lpad(dateNow.getDate() + "", "0", 2) + "-" 
-			+ StringTools.lpad((dateNow.getMonth() + 1) + "", "0", 2) + "-" 
-			+ dateNow.getFullYear();
-		
-		defines += "-D HXCOMPILEU_HAXE_APPROXIMATED_COMPILATION_DATE=\"" + dateString + "\" ";
+		var dateString = dateNow.getHours() + ":" + StringTools.lpad(dateNow.getMinutes() + "", "0", 2) + ":"
+			+ StringTools.lpad(dateNow.getSeconds() + "", "0", 2) + "--" + StringTools.lpad(dateNow.getDate() + "", "0", 2) + "-"
+			+ StringTools.lpad((dateNow.getMonth() + 1) + "", "0", 2) + "-" + dateNow.getFullYear();
+
+		defines += "-D HXCOMPILEU_HAXE_APPROXIMATED_COMPILATION_DATE=\\\"" + dateString + "\\\" ";
 		return defines;
 	}
 
+
 	//////////////////////////////////////////////////////////////
 
 	/**

src/Main.hx

@@ -10,7 +10,6 @@ import src.SlushiUtils;
 import src.compilers.MainCompiler;
 import src.utils.DevKitProUtils;
 import src.utils.UDPListener;
-import fuzzaldrin.Fuzzaldrin;
 
 /**
  * The Main class is the entry point of the HxCompileU compiler.
@@ -20,7 +19,7 @@ import fuzzaldrin.Fuzzaldrin;
  */
 class Main {
 	public static var hxcompileuString = "\x1b[38;5;214mHx\033[0mCompile\x1b[38;5;74mU\033[0m";
-	public static final version:String = "1.5.0";
+	public static final version:String = "1.5.1";
 	static var stdin = Sys.stdin();
 	static var stdout = Sys.stdout();
 	static var args = Sys.args();
@@ -60,16 +59,7 @@ class Main {
 					SlushiUtils.printMsg("Usage: haxeCompileU [command]\nCommands:\n\t--prepare: Creates hxCompileUConfig.json in the current directory.\n\t--import \033[3mHAXE_LIB\033[0m: Imports a JSON file from a Haxe lib to the current directory \n\t--compile: Compiles the project. \n\t\tUse \"--compile --onlyHaxe\" for compiling only the Haxe part. \n\t\tUse \"--compile --onlyCafe\" for compiling only the Wii U part.\n\t\tAdd \"--debug\" or \"--onlyHaxe --debug\" to enable Haxe debug mode\n\t--searchProblem \033[3mLINE_ADDRESS\033[0m: search for a line of code in the [.elf] file from a line address of some log using DevKitPro's powerpc-eabi-addr2line program\n\t--udpServer: Starts the UDP server on port 4405 to view logs from the Wii U\n\t--send: Sends the .rpx or .wps file to the Wii U\n\t--version: Shows the version of the compiler\n\t--help: Shows this message",
 						NONE);
 				default:
-					#if fuzzaldrin
-					var candidates:Array<String> = ["--prepare", "--import", "--compile", "--searchProblem", "--udpServer", "--send", "--version", "--help"];
-					var results = Fuzzaldrin.filter(candidates, args[0]);
-					if (results.length > 0)
-						stdout.writeString("Command " + args[0] + " not found. Did you mean: \033[3m\"" + results[0] + "\"\033[0m?\n");
-					else 
-						SlushiUtils.printMsg("Invalid argument: [" + args.join(" ") + "], use \033[3m--help\033[0m for more information", NONE);
-					#else
-					SlushiUtils.printMsg("Invalid argument: [" + args.join(" ") + "], use \033[3m--help\033[0m for more information", NONE);
-					#end
+					SlushiUtils.printMsg("Invalid argument: [" + args.join(" ") + "], use \033[3m--help\033[0m argument for more information", NONE);
 					return;
 			}
 		} catch (e) {

templates/InitMacroFunctionOneFile

@@ -37,7 +37,7 @@ CFLAGS		:=	-g -Wall -O2 -ffunction-sections \
 
 CFLAGS		+=	$(INCLUDE) -D__WIIU__ -D__WUT__ [DEFINES]
 
-CXXFLAGS	:=	$(CFLAGS) -std=c++17 -Wno-unused-function -Wno-unused-variable -Wno-sequence-point
+CXXFLAGS	:=	$(CFLAGS) -std=c++17 -Wno-unused-function -Wno-unused-variable -Wno-sequence-point -Wunused-but-set-variable -Wreturn-type
 
 ASFLAGS		:=	-g $(MACHDEP)
 LDFLAGS		:=	-g $(MACHDEP) $(RPXSPECS) -Wl,-Map,$(notdir $*.map)