Merge branch 'master' of https://github.com/CrashOveride95/ultrasm64

Makefile

@@ -87,19 +87,15 @@ $(eval $(call validate-option,VERSION,jp us eu sh))
 
 ifeq      ($(VERSION),jp)
   DEFINES   += VERSION_JP=1
-  OPT_FLAGS := -g
   GRUCODE   ?= f3dzex
 else ifeq ($(VERSION),us)
   DEFINES   += VERSION_US=1
-  OPT_FLAGS := -g
   GRUCODE   ?= f3dzex
 else ifeq ($(VERSION),eu)
   DEFINES   += VERSION_EU=1
-  OPT_FLAGS := -O2
   GRUCODE   ?= f3dzex
 else ifeq ($(VERSION),sh)
   DEFINES   += VERSION_SH=1
-  OPT_FLAGS := -O2
   GRUCODE   ?= f3dzex
 endif
 

sm64.ld

@@ -232,7 +232,7 @@ SECTIONS
    BEGIN_NOLOAD(engine)
    {
       BUILD_DIR/src/engine*.o(.bss*);
-      . = ALIGN(0x100);
+      . = ALIGN(0x40);
    }
    END_NOLOAD(engine)
 

src/goddard/gd_main.h

@@ -10,15 +10,12 @@
 // "#define printf(...) /* nothing */" wasn't an option.)
 // This macro is separate from the gd_printf function; one probably
 // forwarded to the other, but it is hard to tell in which direction.
-#ifdef __GNUC__
+
 #define printf(...)                                       \
     _Pragma ("GCC diagnostic push")                       \
     _Pragma ("GCC diagnostic ignored \"-Wunused-value\"") \
     (__VA_ARGS__);                                        \
     _Pragma ("GCC diagnostic pop")
-#else
-#define printf
-#endif
 
 // structs
 struct GdControl { // gGdCtrl

src/libz/zutil.c

@@ -49,7 +49,7 @@ uLong ZEXPORT zlibCompileFlags()
     case 8:     flags += 2 << 6;        break;
     default:    flags += 3 << 6;
     }
-#ifdef DEBUG
+#ifdef PCDEBUG
     flags += 1 << 8;
 #endif
 #if defined(ASMV) || defined(ASMINF)
@@ -103,7 +103,7 @@ uLong ZEXPORT zlibCompileFlags()
     return flags;
 }
 
-#ifdef DEBUG
+#ifdef PCDEBUG
 
 #  ifndef verbose
 #    define verbose 0

src/libz/zutil.h

@@ -227,7 +227,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #endif
 
 /* Diagnostic functions */
-#ifdef DEBUG
+#ifdef PCDEBUG
 #  include <stdio.h>
    extern int z_verbose;
    extern void z_error    OF((char *m));