new makefile : use libs, no ocamake

Makefile

@@ -1,50 +1,104 @@
-EXTLIB=../../mtcvs/extlib-dev
-SWFLIB=../../mtcvs/swflib
-EXTC=../../mtcvs/extc
-NEKO=../neko
-XML=../../mtcvs/xml-light
-LIBS_SRC=$(EXTLIB)/*.ml* -n $(EXTLIB)/install.ml $(SWFLIB)/*.ml* $(EXTC)/extc.ml*
-SRC=$(NEKO)/libs/include/ocaml/*.ml* *.ml*
-LIBS=unix.cmxa str.cmxa $(XML)/xml-light.cmxa
-FLAGS=-o haxe -pp camlp4o -P $(XML)/dtd.mli -lp "-cclib extc_stubs.o -cclib -lz"
-LFLAGS=
-EXPORT=../../../projects/motionTools/haxe
-
-ifeq ($(PPC),1)
-LFLAGS=-ccopt '-arch ppc'
-endif
-
-all: xml
-	ocamlopt $(LFLAGS) -c $(EXTC)/extc_stubs.c
-	ocamake -lp "$(LFLAGS)" $(FLAGS) $(LIBS_SRC) $(SRC) $(LIBS)
-
-xml:
-	(cd ${XML} && make clean xml-light.cmxa)
-
-mode_ppc:
-	sudo ln -sfh /usr/local/bin/ocamlopt.ppc /usr/local/bin/ocamlopt
-	sudo ln -sfh /usr/local/lib/ocaml_ppc /usr/local/lib/ocaml
-
-mode_intel:
-	sudo ln -sfh /usr/local/bin/ocamlopt.intel /usr/local/bin/ocamlopt
-	sudo ln -sfh /usr/local/lib/ocaml_intel /usr/local/lib/ocaml
-
-universal:
-	make PPC=1 clean mode_ppc all
-	mv haxe haxe.ppc
-	make clean mode_intel all
-	mv haxe haxe.intel
-	lipo -create -arch i386 haxe.intel -arch ppc haxe.ppc -output haxe
-	chmod +x haxe
-
-tools:
-	(cd std/tools/haxedoc && haxe haxedoc.hxml && cp haxedoc ../../..)
-	(cd std/tools/haxelib && haxe haxelib.hxml && cp haxelib ../../..)
-
-clean:
-	ocamake $(FLAGS) -clean $(LIBS_SRC) $(SRC) $(LIBS)
-	rm -rf extc_stubs.o
-
-export:
-	cp haxe*.exe doc/CHANGES.txt $(EXPORT)
-	rsync -a --exclude .svn --exclude *.n --exclude std/mt --delete std $(EXPORT)
+# Makefile generated by OCamake 
+# http://tech.motion-twin.com
+.SUFFIXES : .ml .mli .cmo .cmi .cmx .mll .mly
+
+OUTPUT=haxe
+
+CFLAGS= -g -I libs/extlib -I libs/extc -I libs/neko -I libs/swflib -I libs/xml-light
+
+CC_CMD = ocamlopt $(CFLAGS) -c $<
+CC_PARSER_CMD = ocamlopt -pp camlp4o $(CFLAGS) -c parser.ml
+
+LIBS=unix.cmxa str.cmxa libs/extlib/extLib.cmxa libs/xml-light/xml-light.cmxa libs/swflib/swflib.cmxa \
+	libs/extc/extc.cmxa libs/neko/neko.cmxa
+
+MODULES=ast type lexer common genxml parser typecore optimizer typeload \
+	codegen genas3 gencommon gencpp genjs genneko genphp genswf8 \
+	gencs genjava genswf9 interp genswf typer main
+
+all: libs haxe
+
+libs:
+	(cd libs/extlib; make opt)
+	(cd libs/extc; make native)
+	(cd libs/neko; make)
+	(cd libs/swflib; make)
+	(cd libs/xml-light; make xml-light.cmxa)
+
+haxe: $(MODULES:=.cmx)
+	ocamlopt -o $(OUTPUT) $(LIBS) $(MODULES:=.cmx)
+
+codegen.cmx: typeload.cmx typecore.cmx type.cmx genxml.cmx common.cmx ast.cmx
+
+common.cmx: type.cmx ast.cmx
+
+genas3.cmx: type.cmx common.cmx codegen.cmx ast.cmx
+
+gencommon.cmx: type.cmx common.cmx codegen.cmx ast.cmx
+
+gencpp.cmx: type.cmx lexer.cmx common.cmx codegen.cmx ast.cmx
+
+gencs.cmx: type.cmx lexer.cmx gencommon.cmx common.cmx codegen.cmx ast.cmx
+
+genjava.cmx: type.cmx gencommon.cmx common.cmx codegen.cmx ast.cmx
+
+genjs.cmx: type.cmx optimizer.cmx lexer.cmx common.cmx codegen.cmx ast.cmx
+
+genneko.cmx: type.cmx lexer.cmx common.cmx codegen.cmx ast.cmx
+
+genphp.cmx: type.cmx lexer.cmx common.cmx codegen.cmx ast.cmx
+
+genswf.cmx: type.cmx genswf9.cmx genswf8.cmx common.cmx ast.cmx
+
+genswf8.cmx: type.cmx lexer.cmx common.cmx codegen.cmx ast.cmx
+
+genswf9.cmx: type.cmx lexer.cmx genswf8.cmx common.cmx codegen.cmx ast.cmx
+
+genxml.cmx: type.cmx lexer.cmx common.cmx ast.cmx
+
+interp.cmx: typecore.cmx type.cmx lexer.cmx genneko.cmx common.cmx codegen.cmx ast.cmx
+
+main.cmx: typer.cmx typeload.cmx typecore.cmx type.cmx parser.cmx optimizer.cmx lexer.cmx interp.cmx genxml.cmx genswf.cmx genphp.cmx genneko.cmx genjs.cmx genjava.cmx gencs.cmx gencpp.cmx genas3.cmx common.cmx codegen.cmx ast.cmx
+
+optimizer.cmx: typecore.cmx type.cmx parser.cmx common.cmx ast.cmx
+
+parser.cmx: parser.ml lexer.cmx common.cmx ast.cmx
+	$(CC_PARSER_CMD)
+
+type.cmx: ast.cmx
+
+typecore.cmx: type.cmx common.cmx ast.cmx
+
+typeload.cmx: typecore.cmx type.cmx parser.cmx optimizer.cmx lexer.cmx common.cmx ast.cmx
+
+typer.cmx: typeload.cmx typecore.cmx type.cmx parser.cmx optimizer.cmx lexer.cmx interp.cmx genneko.cmx genjs.cmx common.cmx codegen.cmx ast.cmx
+
+lexer.cmx: lexer.ml
+
+lexer.cmx: ast.cmx
+
+
+clean: clean_libs clean_haxe
+
+clean_libs:
+	(cd libs/extlib; make clean)
+	(cd libs/extc; make clean)
+	(cd libs/neko; make clean)
+	(cd libs/swflib; make clean)
+	(cd libs/xml-light; make clean)
+	
+
+clean_haxe:
+	rm -f $(MODULES:=.obj) $(MODULES:=.o) $(MODULES:=.cmx) $(MODULES:=.cmi) lexer.ml
+
+# SUFFIXES
+.ml.cmx:
+	$(CC_CMD)
+
+.mli.cmi:
+	$(CC_CMD)
+
+.mll.ml:
+	ocamllex $<
+
+.PHONY: haxe libs

Makefile.win

@@ -1,68 +1,9 @@
-# Makefile generated by OCamake
-# http://tech.motion-twin.com
-.SUFFIXES : .ml .mli .cmo .cmi .cmx .mll .mly
+include Makefile
 
-CFLAGS=-g -I ../neko/libs/include/ocaml
-LIBS=extLib.cmxa extc.cmxa swfLib.cmxa unix.cmxa xml-light.cmxa str.cmxa
-LFLAGS=-g -o haxe.exe -I ../neko/libs/include/ocaml
-OUTPUT=sed 's/File "\([^"]\+\)", line \([0-9]\+\), \(.*\)/\1(\2): \3/' tmp.cmi
+LIBS += shell32.lib libs/extc/extc_stubs.obj libs/extc/zlib/zlib.lib
 
-FILES = ast.cmx lexer.cmx type.cmx common.cmx parser.cmx typecore.cmx \
-	genxml.cmx optimizer.cmx typeload.cmx codegen.cmx \
-	../neko/libs/include/ocaml/nast.cmx ../neko/libs/include/ocaml/binast.cmx ../neko/libs/include/ocaml/nxml.cmx \
-	genneko.cmx genas3.cmx genjs.cmx genswf8.cmx genswf9.cmx genswf.cmx genphp.cmx gencpp.cmx interp.cmx typer.cmx \
-	main.cmx
+FILTER=sed 's/File "\([^"]\+\)", line \([0-9]\+\), \(.*\)/\1(\2): \3/' tmp.cmi
 
-all: haxe.exe
-
-haxe.exe: $(FILES)
-	ocamlopt $(LFLAGS) $(LIBS) $(FILES)
-
-../neko/libs/include/ocaml/binast.cmx: ../neko/libs/include/ocaml/nast.cmx
-../neko/libs/include/ocaml/nxml.cmx: ../neko/libs/include/ocaml/nast.cmx
-
-codegen.cmx: typeload.cmx typecore.cmx type.cmx genxml.cmx common.cmx ast.cmx
-common.cmx: type.cmx lexer.cmx ast.cmx
-genas3.cmx: type.cmx common.cmx codegen.cmx ast.cmx
-gencpp.cmx: type.cmx common.cmx codegen.cmx ast.cmx
-genjs.cmx: type.cmx lexer.cmx common.cmx codegen.cmx ast.cmx optimizer.cmx
-genneko.cmx: type.cmx lexer.cmx common.cmx codegen.cmx ast.cmx ../neko/libs/include/ocaml/binast.cmx ../neko/libs/include/ocaml/nxml.cmx
-genphp.cmx: type.cmx lexer.cmx common.cmx codegen.cmx ast.cmx
-genswf.cmx: type.cmx genswf9.cmx genswf8.cmx common.cmx ast.cmx
-genswf8.cmx: type.cmx lexer.cmx common.cmx codegen.cmx ast.cmx
-genswf9.cmx: type.cmx lexer.cmx genswf8.cmx common.cmx codegen.cmx ast.cmx
-genxml.cmx: type.cmx lexer.cmx common.cmx ast.cmx
-lexer.cmx: ast.cmx
-main.cmx: typer.cmx typeload.cmx typecore.cmx type.cmx parser.cmx \
-    optimizer.cmx lexer.cmx genxml.cmx genswf.cmx genphp.cmx genneko.cmx \
-    genjs.cmx gencpp.cmx genas3.cmx common.cmx codegen.cmx ast.cmx interp.cmx
-optimizer.cmx: typecore.cmx type.cmx parser.cmx common.cmx ast.cmx
-parser.cmx: parser.ml lexer.cmx common.cmx ast.cmx
-	(ocamlopt -pp camlp4o $(CFLAGS) -c parser.ml 2>tmp.cmi && $(OUTPUT)) || ($(OUTPUT) && exit 1)
-type.cmx: ast.cmx
-typecore.cmx: type.cmx common.cmx ast.cmx
-typeload.cmx: typecore.cmx type.cmx parser.cmx common.cmx ast.cmx optimizer.cmx
-typer.cmx: typeload.cmx typecore.cmx type.cmx parser.cmx optimizer.cmx \
-    lexer.cmx common.cmx codegen.cmx ast.cmx interp.cmx genjs.cmx
-interp.cmx: genneko.cmx type.cmx
-
-clean:
-	rm -f haxe.exe
-	rm -f $(FILES) $(FILES:.cmx=.obj) $(FILES:.cmx=.cmi)
-
-# SUFFIXES
-.ml.cmo:
-	ocamlc $(CFLAGS) -c $<
-
-.ml.cmx:
-	(ocamlopt $(CFLAGS) -c $< 2>tmp.cmi && $(OUTPUT)) || ($(OUTPUT) && exit 1)
-
-.mli.cmi:
-	ocamlc $(CFLAGS) $<
-
-.mll.ml:
-	ocamllex $<
-
-.mly.ml:
-	ocamlyacc $<
+CC_CMD=(ocamlopt $(CFLAGS) -c $< 2>tmp.cmi && $(FILTER)) || ($(FILTER) && exit 1)
+CC_PARSER_CMD=(ocamlopt -pp camlp4o $(CFLAGS) -c parser.ml 2>tmp.cmi && $(FILTER)) || ($(FILTER) && exit 1)
 

haxe.vcproj

@@ -29,9 +29,9 @@
 			ConfigurationType="0">
 			<Tool
 				Name="VCNMakeTool"
-				BuildCommandLine="make -f Makefile.win all"
-				ReBuildCommandLine="make -f Makefile.win clean all"
-				CleanCommandLine="make -f Makefile.win clean"
+				BuildCommandLine="make -f Makefile.win haxe"
+				ReBuildCommandLine="make -f Makefile.win clean_haxe haxe"
+				CleanCommandLine="make -f Makefile.win clean_haxe"
 				Output="haxe.exe"/>
 		</Configuration>
 	</Configurations>