diff --git a/.gitmodules b/.gitmodules index 101fe788..abec7ba0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,3 @@ [submodule "images"] path = images url = https://github.com/copy/images/ -[submodule "mcpp"] - path = mcpp - url = https://github.com/h8liu/mcpp diff --git a/Makefile b/Makefile index 5cd678ae..66ee024b 100644 --- a/Makefile +++ b/Makefile @@ -1,20 +1,6 @@ CLOSURE=../closure-compiler/compiler.jar BROWSER=chromium -CPP_VERSION := $(shell cpp --version 2>/dev/null) - -# MacosX Hack : -# "cpp" doesn't work as expected on MacosX -# So we define mcpp as default, and cpp IF NOT "on MacosX" AND "CPP is defined" -UNAME_S := $(shell uname -s) -CPP=mcpp/src/mcpp -a -C -P -ifneq ($(UNAME_S),Darwin) - ifdef CPP_VERSION - CPP=cpp -P -undef -Wundef -std=c99 -nostdinc -Wtrigraphs -fdollars-in-identifiers -C - endif -endif - - all: build/v86_all.js browser: build/v86_all.js diff --git a/mcpp b/mcpp deleted file mode 160000 index ea453aca..00000000 --- a/mcpp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ea453aca2742be6ac43ba4ce0da6f938a7e5a5d8