Fix building...

mateoconlechuga · mateoconlechuga · commit 7e3111539f0c · 2017-04-06T22:26:49.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/fileioc.h>
+#include <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,7 +11,7 @@
 #include <string.h>
 
 /* Shared library headers - depends on which ones you wish to use */
-#include <lib/fileioc.h>
+#include <fileioc.h>
 
 void prime_factors(unsigned int n);
 
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/fileioc.h>
+#include <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/fileioc.h>
+#include <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/fileioc.h>
+#include <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/graphx.h>
+#include <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/graphx.h>
+#include <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/graphx.h>
+#include <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/graphx.h>
+#include <graphx.h>
 
 /* Use some random color as the transparent one */
 #define TRANSPARENT_COLOR 10
diff --git a/examples/gfx_floodfill/src/main.c b/examples/gfx_floodfill/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* Shared libraries */
-#include <lib/graphx.h>
+#include <graphx.h>
  
 /* Put function prototypes here */
 
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/graphx.h>
+#include <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/graphx.h>
+#include <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/graphx.h>
+#include <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/graphx.h>
+#include <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/graphx.h>
+#include <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/graphx.h>
+#include <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/graphx.h>
+#include <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/graphx.h>
+#include <graphx.h>
 #include "gfx/tiles_gfx.h"
 
 /* Tilemap defines */
diff --git a/examples/keypad_arrows/src/main.c b/examples/keypad_arrows/src/main.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* CE Keypad C Library */
-#include <lib/keypadc.h>
+#include <keypadc.h>
 
 /* Some LCD defines */
 void fillScreen(uint8_t color);
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/keypadc.h>
+#include <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/keypadc.h>
+#include <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/keypadc.h>
+#include <keypadc.h>
 
 /* Function prototypes */
 void printText(int8_t xpos, int8_t ypos, const char *text);
diff --git a/makefile b/makefile
@@ -156,7 +156,6 @@ $(DIRS):
 	$(MKDIR) $(call NATIVEPATH,$(INSTALLLIB)/asm)
 	$(MKDIR) $(call NATIVEPATH,$(INSTALLINC)/ce)
 	$(MKDIR) $(call NATIVEPATH,$(INSTALLINC)/std)
-	$(MKDIR) $(call NATIVEPATH,$(INSTALLINC)/ce/lib)
 
 dist: install
 	$(ARCH)
diff --git a/src/example_makefile b/src/example_makefile
@@ -108,15 +108,15 @@ endif
 
 #Are there any shared libraries that we need to find? If so, add in the proper objects and sources and header files
 ifdef L
-LIBS          := $(call NATIVEPATH,$(foreach var,$(L),$(CEDEV)/lib/asm/$(var)_header.asm))
-LOBJECTS      := $(call WINRELPATH,$(addprefix $(OBJDIR)/,$(notdir $(LIBS:%.asm=%.obj))))
-LIBHOBJ       := $(OBJDIR)/$(LIBHEADER_OBJ)
-LIBS          := $(call WINPATH,$(foreach var,$(L),$(CEDEV)/lib/asm/$(var)_header.asm))
+LIBS          := $(call NATIVEPATH,$(strip $(foreach var,$(L),$(space)$(CEDEV)/lib/asm/$(var)_header.asm)))
+LOBJECTS      := $(call NATIVEPATH,$(addprefix $(OBJDIR)/,$(notdir $(LIBS:%.asm=%.obj))))
+LIBHOBJ       := $(call NATIVEPATH,$(OBJDIR)/$(LIBHEADER_OBJ))
+LIBS          := $(call NATIVEPATH,$(foreach var,$(L),$(CEDEV)/lib/asm/$(var)_header.asm$(space)))
 endif
 
 #Define the nesassary headers, along with any the user may have defined, where modification should just trigger a build
 USERHEADERS   := $(call NATIVEPATH,$(foreach dir,$(ALLDIRS),$(wildcard $(dir)*.h)))
-HEADERS       := $(subst $(space),;,$(call WINPATH,$(ALLDIRS) $(addprefix $(CEDEV)/,include/ce include/ce/libs include/std)))
+HEADERS       := $(subst $(space),;,$(call WINPATH,$(ALLDIRS) $(addprefix $(CEDEV)/,include/ce include/std)))
 HEADERS       := $(subst \;,;,$(HEADERS))
 HEADERS       := $(subst \;,;,$(HEADERS))
 HEADERS       := $(subst /;,;,$(HEADERS))
@@ -271,11 +271,13 @@ $(CSTARTUPOBJ): $(CSTARTUP_LOC)
 	@$(CD) $(OBJDIR) $(chain) \
 	$(AS) $(ASM_FLAGS) $(call WINPATH,$<)
 
-$(LIBHOBJ): $(LIBHEADER_LOC)
+$(LIBHOBJ): $(LIBHEADER_LOC) $(LIBS)
 	@$(CD) $(OBJDIR) $(chain) \
 	$(AS) $(ASM_FLAGS) $(call WINPATH,$<)
+
+$(LIBS):
 	@$(CD) $(OBJDIR) $(chain) \
-	$(AS) $(ASM_FLAGS) $(LIBS)
+	$(AS) $(ASM_FLAGS) $(call WINPATH,$@)
 
 clean:
 	@$(RM) $(call NATIVEPATH,$(BINDIR)/$(TARGETHEX) $(BINDIR)/$(TARGETTYPE) $(BINDIR)/$(TARGETMAP) $(CSTARTUPOBJ) $(LIBHOBJ) $(OBJDIR)/*.obj $(OBJDIR)/*.src $(OBJDIR)/*.asm)
@@ -284,5 +286,5 @@ clean:
 version:
 	@echo C SDK Version $(VERSION)
 
-.PHONY: all clean version add_dirs
+.PHONY: all clean version add_dirs $(LIBS)
 
diff --git a/src/fileioc/makefile b/src/fileioc/makefile
@@ -40,7 +40,7 @@ BIN        ?= $(call NATIVEPATH,$(DEV)/bin)
 INSTALLLOC := $(call NATIVEPATH,$(DESTDIR)$(DEV))
 LIB_LOC    := $(call NATIVEPATH,$(INSTALLLOC)/lib)
 LIBH_LOC   := $(call NATIVEPATH,$(INSTALLLOC)/lib/asm)
-H_LOC      := $(call NATIVEPATH,$(INSTALLLOC)/include/ce/lib/)
+H_LOC      := $(call NATIVEPATH,$(INSTALLLOC)/include/ce/)
 
 EZOBJ       = $(wildcard *.obj)
 EZSRC       = $(wildcard *.src)
diff --git a/src/graphx/makefile b/src/graphx/makefile
@@ -40,7 +40,7 @@ BIN        ?= $(call NATIVEPATH,$(DEV)/bin)
 INSTALLLOC := $(call NATIVEPATH,$(DESTDIR)$(DEV))
 LIB_LOC    := $(call NATIVEPATH,$(INSTALLLOC)/lib)
 LIBH_LOC   := $(call NATIVEPATH,$(INSTALLLOC)/lib/asm)
-H_LOC      := $(call NATIVEPATH,$(INSTALLLOC)/include/ce/lib/)
+H_LOC      := $(call NATIVEPATH,$(INSTALLLOC)/include/ce/)
 
 EZOBJ       = $(wildcard *.obj)
 EZSRC       = $(wildcard *.src)
diff --git a/src/keypadc/makefile b/src/keypadc/makefile
@@ -40,7 +40,7 @@ BIN        ?= $(call NATIVEPATH,$(DEV)/bin)
 INSTALLLOC := $(call NATIVEPATH,$(DESTDIR)$(DEV))
 LIB_LOC    := $(call NATIVEPATH,$(INSTALLLOC)/lib)
 LIBH_LOC   := $(call NATIVEPATH,$(INSTALLLOC)/lib/asm)
-H_LOC      := $(call NATIVEPATH,$(INSTALLLOC)/include/ce/lib/)
+H_LOC      := $(call NATIVEPATH,$(INSTALLLOC)/include/ce/)
 
 EZOBJ       = $(wildcard *.obj)
 EZSRC       = $(wildcard *.src)
diff --git a/tools/convpng b/tools/convpng
@@ -1 +1 @@
-Subproject commit b91aad45dbb6cae75af420154a1538e9be011d2a
+Subproject commit 1a96d666d3ad4d664829e9e0a7a76f246580f56c
