Fix Makefiles

Example.GameLib/Makefile

@@ -32,7 +32,6 @@ ifeq ($(TARGET_ARCH),mingw)
 	RM       := rm -rf
 	MKDIR    := mkdir
 	ECHO     := echo
-	SLASH    := /
 endif
 ifeq ($(TARGET_ARCH),linux)
 	CC       := gcc
@@ -41,8 +40,6 @@ ifeq ($(TARGET_ARCH),linux)
 	RM       := rm -rf
 	MKDIR    := mkdir
 	ECHO     := echo
-	SLASH    := /
-
 endif
 ifeq ($(TARGET_ARCH),macosx)
 	CC       := gcc
@@ -51,8 +48,6 @@ ifeq ($(TARGET_ARCH),macosx)
 	RM       := rm -rf
 	MKDIR    := mkdir
 	ECHO     := echo
-	VERBOSE_BUILD := false
-	SLASH    := /
 	LIBS     := $(LIBS) macosx/SDLMain.m
 endif
 

Example.GameLib/Makefile.common.mk

@@ -6,21 +6,21 @@ ifeq ($(VERBOSE_BUILD),true)
 	DO_CC=$(CC) $(CFLAGS) -o $@ -c $<
 	DO_CXX=$(CXX) $(CFLAGS) -o $@ -c $<
 else
-	DO_CC=@$(ECHO) "CC: $@" ;\
+	DO_CC=@$(ECHO) "CC: $@" &&\
 		$(CC) $(CFLAGS) -o $@ -c $<
-	DO_CXX=@$(ECHO) "CXX: $@" ;\
+	DO_CXX=@$(ECHO) "CXX: $@" &&\
 		$(CXX) $(CFLAGS) -o $@ -c $<
 endif
 
 #####################
 # Game Declarations #
 #####################
-GAME_HEADS := $(GAMELIB_HEADS) Game$(SLASH)GameEnts.h Game$(SLASH)GameMap.h
+GAME_HEADS := Game/GameEnts.h Game/GameMap.h
 GAME_OBJS := \
-	$(BUILDDIR)$(SLASH)Game.o$(SLASH)GameEnts.o \
-	$(BUILDDIR)$(SLASH)Game.o$(SLASH)GameMap.o \
-	$(BUILDDIR)$(SLASH)Game.o$(SLASH)main.o
-RES_GAME_OUT := $(BUILDDIR)$(SLASH)$(RES_GAME)
+	$(BUILDDIR)/GameEnts.o \
+	$(BUILDDIR)/GameMap.o \
+	$(BUILDDIR)/main.o
+RES_GAME_OUT := $(BUILDDIR)/$(RES_GAME)
 
 
 #################
@@ -34,15 +34,14 @@ all: .FORCE $(BUILDDIR) $(RES_GAME_OUT)
 
 $(BUILDDIR):
 	$(MKDIR) $(BUILDDIR)
-	$(MKDIR) $(BUILDDIR)$(SLASH)Game.o
 
 full-clean: clean
 	(cd $(GAMELIB_DIR) && make clean $(GAMELIB_MAKEPARAMS))
 
 clean:
-	$(RM) $(GAME_OBJS) $(RES_GAME_OUT)
+	$(RM) $(BUILDDIR)
 
-run: $(BUILDDIR) $(RES_GAME_OUT)
+run: .FORCE $(BUILDDIR) $(RES_GAME_OUT)
 	$(LAUNCHER) ./$(RES_GAME_OUT) debug
 
 rebuild: clean all
@@ -52,11 +51,11 @@ rebuild: clean all
 # Game Rules #
 ##############
 
-$(BUILDDIR)$(SLASH)Game.o$(SLASH)GameEnts.o: src$(SLASH)GameEnts.c $(HEADS)
+$(BUILDDIR)/GameEnts.o: src/GameEnts.c $(HEADS)
 	$(DO_CC)
-$(BUILDDIR)$(SLASH)Game.o$(SLASH)GameMap.o: src$(SLASH)GameMap.c $(HEADS)
+$(BUILDDIR)/GameMap.o: src/GameMap.c $(HEADS)
 	$(DO_CC)
-$(BUILDDIR)$(SLASH)Game.o$(SLASH)main.o: src$(SLASH)main.c $(HEADS)
+$(BUILDDIR)/main.o: src/main.c $(HEADS)
 	$(DO_CC)
 
 

Example.GameLib/Makefile.emscripten.mk

@@ -1,18 +1,17 @@
 CC       := emcc
 AR       := emar
 LAUNCHER := emrun --port 8080
-RM       := del
+RM       := del /Q /S
 MKDIR    := mkdir
 ECHO     := echo
-VERBOSE_BUILD := true
-SLASH    := \\
+VERBOSE_BUILD := false
 
 GAMELIB_DIR   := ..
-GAMELIB_MAKEPARAMS := -f Makefile.emscripten.mk target=release
+GAMELIB_MAKEPARAMS := -f Makefile.emscripten.mk
 
 LIBS       := 
-STATICLIBS := $(GAMELIB_DIR)$(SLASH)build-emscripten$(SLASH)libgame.a
-CFLAGS     := -s FULL_ES2=1 -s ASM_JS=1 -O1 -Wno-implicit-function-declaration -DEMSCRIPTEN -I$(GAMELIB_DIR)$(SLASH)src 
+STATICLIBS := $(GAMELIB_DIR)/build-emscripten/libgame.a
+CFLAGS     := -s FULL_ES2=1 -s ASM_JS=1 -O1 -Wno-implicit-function-declaration -DEMSCRIPTEN -I$(GAMELIB_DIR)/src 
 PLATFORM   := emscripten
 EXEEXT     := .html
 LDFLAGS    := --preload-file data -s TOTAL_MEMORY=134217728 -lidbfs.js

Example.GameLib/dist-emscripten.cmd

@@ -4,8 +4,8 @@ make -f Makefile.emscripten.mk target=release full-clean
 make -f Makefile.emscripten.mk target=release
 
 mkdir DIST\web
-copy web\* DIST\web\
-copy build-emscripten-release\game.* DIST\web\
+xcopy web\* DIST\web\ /s /e /y
+xcopy build-emscripten-release\game.* DIST\web\ /s /e /y
 
 
 pause