.

[henge/webcc.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 7cf0c1f..2fb24c9 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -16,19 +16,20 @@ APP_RULES += move
 HTML      := index.html js/the_march.config.js
 CC        := emcc
 EXPORTS   := '_em_main'
-EMOPTS    := --separate-asm -s ALLOW_MEMORY_GROWTH=1 -s FORCE_FILESYSTEM=1 --pre-js html/js/pre.js
+EMOPTS    := --verbose --separate-asm -s ALLOW_MEMORY_GROWTH=1 -s FORCE_FILESYSTEM=1 --pre-js html/js/pre.js
 LIBS      += -s USE_SDL=2 -s USE_SDL_TTF=2 -s USE_SDL_IMAGE=2 -s SDL2_IMAGE_FORMATS='["png"]'
 EXEPATH   := ../dist/bin/jasm/js
 EXE       := $(APPNAME).js
 OBJFILE   :=bc
-EMFLAGS   := $(EMOPTS) $(LIBS) -s EXPORTED_FUNCTIONS="[$(EXPORTS)]"
+EMFLAGS   := $(EMOPTS) -s EXPORTED_FUNCTIONS="[$(EXPORTS)]"
 EMFLAGS   += -I/usr/include/google
 BYPRODUCT := $(APPNAME).asm.js $(APPNAME).js.mem
 else
 #Native Build Environment
 CC        := gcc
-LIBS      := -lprotobuf-c
-LIBS      += -lSDL2_ttf -lSDL2_image -lSDL2main -lSDL2 -lopengl32
+CFLAGS    += -v
+#LIBS      := -lprotobuf-c
+LIBS      += -lSDL2_ttf -lSDL2_image -lSDL2main -lSDL2
 EXEPATH   := ../dist/bin/$(shell uname -m)
 #windows mingw build rules
 ifeq ($(OS), Windows_NT)
@@ -84,7 +85,7 @@ dox doc:
 
 #clean up intermediate dependency files and binaries
 clean: $(CLEAN_RULES)
-       @echo "Cleaning - Recompiling .d (deps) and .$(OBJFILE) (obj)"
+       @echo "Cleaning .d (deps) and .$(OBJFILE) (obj)"
        @rm -f $(EXEPATH)/$(EXE) $(patsubst %,$(EXEPATH)/%, $(BYPRODUCT))
        @rm -f $(patsubst %,%/*.$(OBJFILE), $(MODULES))
        @rm -f $(patsubst %,%/*.d, $(MODULES))
@@ -106,7 +107,7 @@ move: $(HTML)
 
 #new default .o for .c files
 %.bc %.o: %.c %.d
-       $(CC) -c $(EMFLAGS) $(CPPFLAGS) $(CFLAGS) $< -o $@
+       $(CC) -c $(EMFLAGS) $(CPPFLAGS) $(CFLAGS) $< -o $@ $(LIBS)
 
 #default for .d dependency files (output from gcc -M)
 %.d: %.c