Added some Linux compatibility

buu342 · Aug 15, 2020 · d9c66d7 · d9c66d7
1 parent df27467
commit d9c66d7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/Examples/1. Hello World/main.c b/Examples/1. Hello World/main.c
@@ -18,7 +18,7 @@ Handles the boot process of the ROM.
 
 
 /*********************************
-             Threads
+         Thread Pointers
 *********************************/
 
 OSThread idleThread;

diff --git a/Examples/1. Hello World/makefile b/Examples/1. Hello World/makefile
@@ -37,13 +37,13 @@ APP = $(TARGETS:.n64=.out)
 ifeq ($(DEBUG_MODE), 0)
     CODEOBJECTS     = $(CODECFILES:.c=.o)
     OPTIMIZER       = -O2
-    LCDEFS          = -D_FINALROM -DNDEBUG -DF3DEX_GBI_2
+    LCDEFS          = -D_FINALROM -DNDEBUG -DF3DEX_GBI_2 -DNOT_SPEC
     N64LIB          = -lgultra_rom
     MAKEROMFLAGS    = 
 else
     CODEOBJECTS     = $(CODECFILES:.c=.o) $(DEBUGFILES:.c=.o)
     OPTIMIZER       = -g
-    LCDEFS          = -DDEBUG  -DF3DEX_GBI_2
+    LCDEFS          = -DDEBUG  -DF3DEX_GBI_2 -DNOT_SPEC
     N64LIB          = -lgultra_d
     MAKEROMFLAGS    = -d
 endif

diff --git a/Examples/1. Hello World/makefile.linux b/Examples/1. Hello World/makefile.linux
@@ -1,7 +1,7 @@
 ################################################################
 #	THIS MAKEFILE IS MEANT FOR THE N64 SDK FOR LINUX       #
 #	BY CRASHOVERIDE. IF USING Partner-N64 SDK PLEASE       #
-#	USE makefile.dos!!!!!!!!!!!!!!!!!!!!!!!!!!!!!	       #
+#	USE THE OTHER makefile!!!!!!!!!!!!!!!!!!!!!!!!!!       #
 ################################################################
 
 ################################################################

diff --git a/Examples/1. Hello World/osconfig.h b/Examples/1. Hello World/osconfig.h
@@ -28,8 +28,10 @@
     #define	MAINSTACKSIZE   0x2000
 
     // Stack pointers
-    extern u64 bootStack[BOOTSTACKSIZE/sizeof(u64)];
-    extern u64 idleThreadStack[IDLESTACKSIZE/sizeof(u64)];
-    extern u64 mainThreadStack[MAINSTACKSIZE/sizeof(u64)];
+    #ifdef	NOT_SPEC  // For Linux Compatibility
+        extern u64 bootStack[BOOTSTACKSIZE/sizeof(u64)];
+        extern u64 idleThreadStack[IDLESTACKSIZE/sizeof(u64)];
+        extern u64 mainThreadStack[MAINSTACKSIZE/sizeof(u64)];
+    #endif
 
 #endif