Minor changes to ensure windows working

Author: mateoconlechuga

src/ce/makefile

@@ -27,8 +27,8 @@ LIB_H      := $(wildcard *.h)
 SRC        := $(wildcard *.src)
 
 ifeq ($(OS),Windows_NT)
-COPY_HEADERS = (robocopy . $(LOC_H) $(LIB_H) /njh /njs /ndl /nc /ns) ^& exit 0
-COPY_SRCS = (robocopy . $(LOC_H) $(SRC) /njh /njs /ndl /nc /ns) ^& exit 0
+COPY_HEADERS = (robocopy . $(LOC_H) $(notdir $(LIB_H)) /njh /njs /ndl /nc /ns) ^& exit 0
+COPY_SRCS = (robocopy . $(LIB_LOC) $(notdir $(SRC)) /njh /njs /ndl /nc /ns) ^& exit 0
 else
 COPY_HEADERS = $(CP) $(LIB_H) $(LOC_H)
 COPY_SRCS = $(CP) $(SRC) $(LIB_LOC)

src/core_makefile

@@ -9,6 +9,7 @@ INIT_LOC            ?= D1A87F
 USE_FLASH_FUNCTIONS ?= YES
 OUTPUT_MAP          ?= YES
 ARCHIVED            ?= NO
+OPT_MODE            ?= -optsize
 #----------------------------
 SRCDIR              ?= src
 OBJDIR              ?= obj
@@ -37,7 +38,7 @@ CCDEBUGFLAG = -nodebug
 # get the os specific items
 ifeq ($(OS),Windows_NT)
 SHELL     := cmd.exe
-CURDIR    := $(shell cmd /c for %%I in ("$(CURDIR)") do @echo %%~sI)
+MAKEDIR   := $(CURDIR)
 NATIVEPATH = $(subst /,\,$(1))
 WINPATH    = $(NATIVEPATH)
 WINRELPATH = $(subst /,\,$(1))
@@ -108,8 +109,8 @@ LINK_ASMSOURCES := $(ASMSOURCES)
 LINK_FILES    += $(call TOLOWER,$(LINK_CSOURCES))
 LINK_FILES    += $(call TOLOWER,$(LINK_CPPSOURCES))
 LINK_FILES    += $(LINK_ASMSOURCES)
-LINK_FILES    += $(wildcard $(CEDEV)/lib/shared/*.src)
-LINK_LIBLOAD  := $(wildcard $(CEDEV)/lib/libload/*.asm)
+LINK_FILES    += $(call NATIVEPATH,$(wildcard $(CEDEV)/lib/shared/*.src))
+LINK_LIBLOAD  := $(call NATIVEPATH,$(wildcard $(CEDEV)/lib/libload/*.asm))
 
 # check if there is an icon present that we can convert; if so, generate a recipe to build it properly
 ifneq ("$(wildcard $(ICONPNG))","")
@@ -141,14 +142,18 @@ endif
 
 # define the nesassary headers, along with any the user may have defined, where modification should just trigger a build
 HEADERS :=$(strip $(subst $(space),;,$(call WINPATH,$(sort $(dir $(USERHEADERS))))))
+ifeq ($(words $(HEADERS)),0)
+HEADERS :=$(call WINPATH,$(CEDEV)/include);$(call WINPATH,$(CEDEV)/include/compat)
+else
 HEADERS +=$(strip ;$(call WINPATH,$(CEDEV)/include);$(call WINPATH,$(CEDEV)/include/compat))
+endif
 HEADERS :=$(subst \;,;,$(HEADERS))
 HEADERS :=$(subst \;,;,$(HEADERS))
 HEADERS :=$(subst /;,;,$(HEADERS))
 
 # define the C flags used by the Zilog compiler
 CFLAGS ?= \
-    -noasm $(CCDEBUGFLAG) -nogenprint -keepasm -quiet -optsize -cpu:EZ80F91 -noreduceopt -nolistinc -nomodsect \
+    -noasm $(CCDEBUGFLAG) -nogenprint -keepasm -quiet $(OPT_MODE) -cpu:EZ80F91 -noreduceopt -nolistinc -nomodsect \
     -stdinc:"$(HEADERS)" -define:_EZ80F91 -define:_EZ80 -define:$(DEBUGMODE)
 
 # these are the linker flags, basically organized to properly set up the environment
@@ -165,8 +170,8 @@ LDFLAGS ?= \
 	-i 'locate header at $$$(INIT_LOC)' \
 	-i 'libs $(LINK_LIBLOAD)' \
 	-i 'order header,icon,launcher,libs,startup,cleanup,exit,code,data,strsect,text' \
-	-i 'sources "$(F_LAUNCHER)" if libs.length, "$(F_ICON)" if $(U_ICON), "$(F_CLEANUP)" if $(U_CLEANUP)' \
-	-i 'sources "$(F_STARTUP)"' \
+	-i 'sources '$(F_LAUNCHER)' if libs.length, '$(F_ICON)' if $(U_ICON), '$(F_CLEANUP)' if $(U_CLEANUP)' \
+	-i 'sources '$(F_STARTUP)'' \
 	-i 'deps $(call NATIVEPATH,$(LINK_FILES))'
 
 ifneq ($(OS),Windows_NT)
@@ -204,15 +209,15 @@ $(OBJDIR)/$(ICON_ASM): $(ICONPNG)
 
 # these rules compile the source files into object files
 $(OBJDIR)/%.src: */%.c $(USERHEADERS)
-	@$(call SAFEMKDIR,$(@D)) && \
-	$(CD) $(call NATIVEPATH,$(@D)) && \
-	$(CC) $(CFLAGS) "$(call WINPATH,$(addprefix $(CURDIR)/,$<))"
+	@($(call SAFEMKDIR,$(@D))) && \
+	($(CD) $(call NATIVEPATH,$(@D))) && \
+	$(CC) $(CFLAGS) "$(call WINPATH,$(addprefix $(MAKEDIR)/,$<))"
 
 # these rules compile the source files into object files
 $(OBJDIR)/%.src: **/*/%.c $(USERHEADERS)
-	@$(call SAFEMKDIR,$(@D)) && \
-	$(CD) $(call NATIVEPATH,$(@D)) && \
-	$(CC) $(CFLAGS) "$(call WINPATH,$(addprefix $(CURDIR)/,$<))"
+	@($(call SAFEMKDIR,$(@D))) && \
+	($(CD) $(call NATIVEPATH,$(@D))) && \
+	$(CC) $(CFLAGS) "$(call WINPATH,$(addprefix $(MAKEDIR)/,$<))"
 
 clean:
 	@$(RMDIR) $(call NATIVEPATH,$(OBJDIR))

src/std/makefile

@@ -34,9 +34,9 @@ LIB_H       = $(call NATIVEPATH,$(wildcard *.h))
 
 ifeq ($(OS),Windows_NT)
 COPY_HEADERS = (robocopy . $(LOC_H) $(LIB_H) /njh /njs /ndl /nc /ns) ^& exit 0
-COPY_LIBSTATIC = (robocopy . $(call NATIVEPATH,$(LIB_LOC)/static) /njh /njs /ndl /nc /ns) ^& exit 0
-COPY_LIBSHARED = (robocopy . $(call NATIVEPATH,$(LIB_LOC)/shared) $(LIBSHARED) /njh /njs /ndl /nc /ns) ^& exit 0
-COPY_LIBLINKED = (robocopy . $(call NATIVEPATH,$(LIB_LOC)/linked) $(LIBLINKED) /njh /njs /ndl /nc /ns) ^& exit 0
+COPY_LIBSTATIC = (robocopy $(STATICDIR) $(call NATIVEPATH,$(LIB_LOC)/static) $(notdir $(LIBSTATIC)) /njh /njs /ndl /nc /ns) ^& exit 0
+COPY_LIBSHARED = (robocopy $(SHAREDDIR) $(call NATIVEPATH,$(LIB_LOC)/shared) $(notdir $(LIBSHARED)) /njh /njs /ndl /nc /ns) ^& exit 0
+COPY_LIBLINKED = (robocopy $(LINKEDDIR) $(call NATIVEPATH,$(LIB_LOC)/linked) $(notdir $(LIBLINKED)) /njh /njs /ndl /nc /ns) ^& exit 0
 else
 COPY_HEADERS = $(CP) $(LIB_H) $(LOC_H)
 COPY_LIBSTATIC = $(CP) $(LIBSTATIC) $(call NATIVEPATH,$(LIB_LOC)/static)

tools/fasmg/makefile

@@ -7,7 +7,7 @@ ifeq ($(OS),Windows_NT)
 SHELL      =cmd.exe
 NATIVEPATH =$(subst /,\,$(1))
 RM         =del /f 2>nul
-CP         =xcopy /y
+CP         =echo f|xcopy /y
 PREFIX    ?=C:
 NAME       =fasmg.exe
 FASMGP     =windows\$(NAME)
@@ -22,7 +22,7 @@ NATIVEPATH =$(subst \,/,$(1))
 RM         =rm -f
 CP         =cp
 PREFIX    ?=$(HOME)
-ADDEXE     =chmod +x $(NAME)
+ADDEXE     =&& chmod +x $(NAME)
 endif
 
 DEV ?=$(call NATIVEPATH,$(PREFIX)/CEdev)
@@ -36,7 +36,7 @@ FILES      :=$(addprefix $(INCDIR),ez80.inc ld.fasmg ti84pceg.inc tiformat.inc)
 INCFILES   :=$(addprefix $(INC),ez80.inc ld.fasmg ti84pceg.inc tiformat.inc)
 
 all: $(FILES)
-	$(CP) $(call NATIVEPATH,$(FASMGP)) . && $(ADDEXE)
+	$(CP) $(call NATIVEPATH,$(FASMGP)) . $(ADDEXE)
 
 $(FILES):
 	$(CP) $(call NATIVEPATH,fasmg-ez80/$(@F)) $(INCDIR)$(@F)