a_star: don't crash on deserialization errors and limit static types

[nit.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 4a4c9e3..72aaaa3 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -15,19 +15,28 @@
 # limitations under the License.
 
 NITCOPT=--semi-global
-OLDNITCOPT=
-OBJS=nitc nitpick nit nitdoc nitls nitunit nitpretty nitmetrics nitx nitlight nitdbg_client nitserial
+OLDNITCOPT=--semi-global
+OBJS=nitc nitpick nit nitdoc nitls nitunit nitpretty nitmetrics nitx nitlight nitserial nitrestful
 SRCS=$(patsubst %,%.nit,$(OBJS))
 BINS=$(patsubst %,../bin/%,$(OBJS))
 
+# Workaround: Cygwin requires peflags to bootstrap
+peflags := ${shell which peflags 2>/dev/null}
+
 all: bin/nitc
 
+pre-build:
+       ./git-gen-version.sh
+
 nitc_0: ../c_src/nitc parser/parser.nit
        @echo '***************************************************************'
        @echo '* Compile nitc_0 from NIT source files                        *'
        @echo '***************************************************************'
        ./git-gen-version.sh
        ../c_src/nitc ${OLDNITCOPT} -o nitc_0 -v nitc.nit
+ifdef peflags
+       ${peflags} --cygwin-heap=2048 nitc_0
+endif
 
 bin/nitc: nitc_0 parser/parser.nit
        @echo '***************************************************************'
@@ -47,6 +56,9 @@ $(OBJS): nitc_0 parser/parser.nit
        @echo '***************************************************************'
        cd ../c_src; make
        rm ../c_src/*.o || true # to reduce disc used
+ifdef peflags
+       ${peflags} --cygwin-heap=2048 ../c_src/nitc
+endif
 
 parser/parser.nit:
        @echo '***************************************************************'