Added some changes (Should work okay on mac now)

mateoconlechuga · mateoconlechuga · commit 097cf10bb453 · 2017-03-31T19:12:17.000-07:00
diff --git a/examples/fileio_detect/src/main.c b/examples/fileio_detect/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared library headers -- depends on which ones you wish to use */
-#include <lib/ce/fileioc.h>
+#include <libs/fileioc.h>
 
 /* Function prototypes */
 void printText(int8_t xpos, int8_t ypos, const char *text);
diff --git a/examples/fileio_factorize/src/main.c b/examples/fileio_factorize/src/main.c
@@ -11,11 +11,11 @@
 #include <string.h>
 
 /* Shared library headers - depends on which ones you wish to use */
-#include <lib/ce/fileioc.h>
+#include <libs/fileioc.h>
 
-void prime_factors(unsigned n);
+void prime_factors(unsigned int n);
 
-int primes[24];
+int primes[512];
 int total_primes = 0;
 
 /* Main Function */
@@ -46,8 +46,8 @@ void main(void) {
 }
 
 /* Store to an array all the prime numbers */
-void prime_factors(unsigned n) {
-    unsigned div, end;
+void prime_factors(unsigned int n) {
+    unsigned int div, end;
     
     while (!(n % 2)) {
         primes[total_primes++] = 2;
diff --git a/examples/fileio_os_vars/src/main.c b/examples/fileio_os_vars/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared library headers - depends on which ones you wish to use */
-#include <lib/ce/fileioc.h>
+#include <libs/fileioc.h>
 
 /* Some function prototypes. Maybe in the future these functions will become a library */
 cplx_t Int24sToCplx(int real, int imag);
diff --git a/examples/fileio_read_write/src/main.c b/examples/fileio_read_write/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared library headers -- depends on which ones you wish to use */
-#include <lib/ce/fileioc.h>
+#include <libs/fileioc.h>
 
 /* Declare some strings and variables */
 const char nameAppVar[] = "AppVar";
diff --git a/examples/fileio_tokens/src/main.c b/examples/fileio_tokens/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared library headers -- depends on which ones you wish to use */
-#include <lib/ce/fileioc.h>
+#include <libs/fileioc.h>
 
 /* Declare some strings and variables */
 const char prgmName[] = "ABC";
diff --git a/examples/gfx_buffered_cube/src/main.c b/examples/gfx_buffered_cube/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared libraries */
-#include <lib/ce/graphx.h>
+#include <libs/graphx.h>
 
 /* Put function prototypes here */
 void rotate(void);
diff --git a/examples/gfx_buffering/src/main.c b/examples/gfx_buffering/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared libraries */
-#include <lib/ce/graphx.h>
+#include <libs/graphx.h>
 
 /*
  * This tutorial is meant to be played around with to get a feeling for how buffering works
diff --git a/examples/gfx_char/src/main.c b/examples/gfx_char/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared libraries */
-#include <lib/ce/graphx.h>
+#include <libs/graphx.h>
 
 /* Use some random color as the transparent one */
 #define TRANSPARENT_COLOR 10
diff --git a/examples/gfx_clipping/src/main.c b/examples/gfx_clipping/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared libraries */
-#include <lib/ce/graphx.h>
+#include <libs/graphx.h>
 
 /* Use some random color as the transparent one */
 #define TRANSPARENT_COLOR 10
diff --git a/examples/gfx_hello_world/src/main.c b/examples/gfx_hello_world/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared libraries */
-#include <lib/ce/graphx.h>
+#include <libs/graphx.h>
 
 #define FONT_HEIGHT 8
 
diff --git a/examples/gfx_light_dark/src/main.c b/examples/gfx_light_dark/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared libraries */
-#include <lib/ce/graphx.h>
+#include <libs/graphx.h>
 
 #define color gfx_RGBTo1555(34, 55, 89)
 
diff --git a/examples/gfx_shapes_shift/src/main.c b/examples/gfx_shapes_shift/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared libraries */
-#include <lib/ce/graphx.h>
+#include <libs/graphx.h>
 
 /* Place function prototypes here */
 
diff --git a/examples/gfx_sprite/src/main.c b/examples/gfx_sprite/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared libraries */
-#include <lib/ce/graphx.h>
+#include <libs/graphx.h>
 
 /* Include the sprite data */
 #include "gfx/logo_gfx.h"
diff --git a/examples/gfx_sprite_compress/src/main.c b/examples/gfx_sprite_compress/src/main.c
@@ -14,7 +14,7 @@
 #include <decompress.h>
 
 /* Shared libraries */
-#include <lib/ce/graphx.h>
+#include <libs/graphx.h>
 #include "gfx/all_gfx.h"
 
 /* Put all your code here */
diff --git a/examples/gfx_sprite_rotate/src/main.c b/examples/gfx_sprite_rotate/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared libraries */
-#include <lib/ce/graphx.h>
+#include <libs/graphx.h>
 #include "gfx/logo_gfx.h"
 
 /* Defines used below */
diff --git a/examples/gfx_tilemap/src/main.c b/examples/gfx_tilemap/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared libraries */
-#include <lib/ce/graphx.h>
+#include <libs/graphx.h>
 #include "gfx/tiles_gfx.h"
 
 /* Tilemap defines */
diff --git a/examples/gfx_tilemap_compress/src/main.c b/examples/gfx_tilemap_compress/src/main.c
@@ -14,7 +14,7 @@
 #include <decompress.h>
 
 /* Shared libraries */
-#include <lib/ce/graphx.h>
+#include <libs/graphx.h>
 #include "gfx/tiles_gfx.h"
 
 /* Tilemap defines */
diff --git a/examples/keypad_interrupt/src/main.c b/examples/keypad_interrupt/src/main.c
@@ -14,7 +14,7 @@
 #include <intce.h>
 
 /* CE Keypad C Library */
-#include <lib/ce/keypadc.h>
+#include <libs/keypadc.h>
 
 /* Function prototypes */
 void interrupt isr_on(void);
diff --git a/examples/keypad_interrupt2/src/main.c b/examples/keypad_interrupt2/src/main.c
@@ -14,7 +14,7 @@
 #include <intce.h>
 
 /* CE Keypad C Library */
-#include <lib/ce/keypadc.h>
+#include <libs/keypadc.h>
 
 /* Function prototypes */
 void interrupt isr_on(void);
diff --git a/examples/keypad_multiple_keys/src/main.c b/examples/keypad_multiple_keys/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* CE Keypad C Library */
-#include <lib/ce/keypadc.h>
+#include <libs/keypadc.h>
 
 /* Function prototypes */
 void printText(int8_t xpos, int8_t ypos, const char *text);
diff --git a/makefile b/makefile
@@ -15,7 +15,7 @@ CPDIR      = xcopy
 else
 NATIVEPATH = $(subst \,/,$(1))
 WINPATH    = $(shell winepath --windows $(1))
-RM         = rm --force
+RM         = rm -f
 MKDIR      = mkdir -p
 RMDIR      = rm -rf
 PREFIX    ?= $(HOME)
diff --git a/src/ce/makefile b/src/ce/makefile
@@ -17,7 +17,7 @@ PREFIX    ?= C:
 else
 NATIVEPATH = $(subst \,/,$(1))
 WINPATH    = $(subst \,\\,$(shell winepath --windows $(1)))
-RM         = rm --force
+RM         = rm -f
 ASM        = $(call NATIVEPATH,wine $(BIN)/ez80asm.exe)
 LIB        = $(call NATIVEPATH,wine $(BIN)/ez80lib.exe)
 CP         = cp
diff --git a/src/example_makefile b/src/example_makefile
@@ -42,7 +42,7 @@ else
 NATIVEPATH = $(subst \,/,$(1))
 WINPATH    = $(subst \,\\,$(shell winepath --windows $(1)))
 WINRELPATH = $(subst /,\,$(1))
-RM         = rm --force
+RM         = rm -f
 CEDEV     ?= $(call NATIVEPATH,$(realpath ..\..))
 BIN       ?= $(call NATIVEPATH,$(CEDEV)/bin)
 AS         = $(call NATIVEPATH,wine $(BIN)/ez80asm.exe)
@@ -240,7 +240,7 @@ $(BINDIR)/$(TARGET8XP): $(BINDIR)/$(TARGETHEX)
 
 $(BINDIR)/$(TARGETHEX): $(CSTARTUPOBJ) $(LIBHOBJ) $(OBJECTS)
 	echo C CE SDK Version $(VERSION)
-	$(LD) $(LDFLAGS) $@ = "$(subst $(space),$(comma),$(strip $(call WINRELPATH,$^) $(LOBJECTS)$(LIBRARIES)))"
+	$(LD) $(LDFLAGS) $@ = "$(subst $(space),$(comma),$(call WINRELPATH,$^) $(LOBJECTS)$(LIBRARIES))"
 
 #This rule handles conversion of the icon, if it is ever updated
 $(OBJDIR)/$(ICON_OBJ): $(ICONPNG)
diff --git a/src/fileioc/makefile b/src/fileioc/makefile
@@ -24,7 +24,7 @@ PREFIX     ?= C:
 else
 NATIVEPATH  = $(subst \,/,$(1))
 WINPATH     = $(subst \,\\,$(shell winepath --windows $(1)))
-RM          = rm --force
+RM          = rm -f
 MKDIR       = mkdir -p
 ASM         = $(call NATIVEPATH,wine $(BIN)/ez80asm.exe)
 LIB         = $(call NATIVEPATH,wine $(BIN)/ez80lib.exe)
diff --git a/src/fileioc/relocation_table b/src/fileioc/relocation_table
@@ -1,3 +1,4 @@
+
  .dw 132
  .dw 136
  .dw 141
diff --git a/src/graphx/makefile b/src/graphx/makefile
@@ -24,7 +24,7 @@ PREFIX     ?= C:
 else
 NATIVEPATH  = $(subst \,/,$(1))
 WINPATH     = $(subst \,\\,$(shell winepath --windows $(1)))
-RM          = rm --force
+RM          = rm -f
 MKDIR       = mkdir -p
 ASM         = $(call NATIVEPATH,wine $(BIN)/ez80asm.exe)
 LIB         = $(call NATIVEPATH,wine $(BIN)/ez80lib.exe)
diff --git a/src/graphx/relocation_table b/src/graphx/relocation_table
@@ -1,3 +1,4 @@
+
  .dw 39
  .dw 53
  .dw 61
diff --git a/src/include/relocation.inc b/src/include/relocation.inc
@@ -14,7 +14,7 @@
  
  #define noextname eval(name)
  
- .echo > relocation_table ""
+ .echo > relocation_table "\n"
  .echo > totname " .db 192,\"",noextname,"\",0,"
  .echo > asmname " define .",noextname,"_header,space=ram\n define .",noextname,",space=ram\n segment .",noextname,"_header\n .assume adl=1\n db 192,\"",ucname,"\",0,"
  .db 192,193
diff --git a/src/keypadc/makefile b/src/keypadc/makefile
@@ -24,7 +24,7 @@ PREFIX     ?= C:
 else
 NATIVEPATH  = $(subst \,/,$(1))
 WINPATH     = $(subst \,\\,$(shell winepath --windows $(1)))
-RM          = rm --force
+RM          = rm -f
 MKDIR       = mkdir -p
 ASM         = $(call NATIVEPATH,wine $(BIN)/ez80asm.exe)
 LIB         = $(call NATIVEPATH,wine $(BIN)/ez80lib.exe)
diff --git a/src/keypadc/relocation_table b/src/keypadc/relocation_table
@@ -0,0 +1 @@
+
diff --git a/src/std/linked/makefile b/src/std/linked/makefile
@@ -19,7 +19,7 @@ CC         = $(call NATIVEPATH,$(BIN)/ez80cc.exe)
 else
 NATIVEPATH = $(subst \,/,$(1))
 WINPATH    = $(subst \,\\,$(shell winepath --windows $(1)))
-RM         = rm --force
+RM         = rm -f
 PREFIX    ?= $(HOME)
 DEV       ?= $(call NATIVEPATH,$(PREFIX)/CEdev)
 BIN       ?= $(call NATIVEPATH,$(DEV)/bin)
diff --git a/src/std/shared/makefile b/src/std/shared/makefile
@@ -18,7 +18,7 @@ CC         = $(call NATIVEPATH,$(BIN)/ez80cc.exe)
 else
 NATIVEPATH = $(subst \,/,$(1))
 WINPATH    = $(subst \,\\,$(shell winepath --windows $(1)))
-RM         = rm --force
+RM         = rm -f
 CEDEV     ?= $(HOME)/CEdev
 BIN       ?= $(CEDEV)/bin
 ASM        = $(call NATIVEPATH,wine $(BIN)/ez80asm.exe)
diff --git a/src/std/static/makefile b/src/std/static/makefile
@@ -18,7 +18,7 @@ CC         = $(call NATIVEPATH,$(BIN)/ez80cc.exe)
 else
 NATIVEPATH = $(subst \,/,$(1))
 WINPATH    = $(subst \,\\,$(shell winepath --windows $(1)))
-RM         = rm --force
+RM         = rm -f
 CEDEV     ?= $(HOME)/CEdev
 BIN       ?= $(CEDEV)/bin
 ASM        = $(call NATIVEPATH,wine $(BIN)/ez80asm.exe)
diff --git a/tools/spasm-ng b/tools/spasm-ng
@@ -1 +1 @@
-Subproject commit 0383c551a6a26f690cf93c45b9e0ad7b99047c0b
+Subproject commit 9f990ff800acdf1d5a6fdf0da5b072ec0ce36bfe
