Nicolas Cannasse пре 13 година
родитељ
комит
29f89e205a
2 измењених фајлова са 4 додато и 2 уклоњено
  1. 3 1
      Makefile
  2. 1 1
      Makefile.win

+ 3 - 1
Makefile

@@ -12,6 +12,8 @@ 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
 
+NATIVE_LIBS=-cclib -lz -cclib libs/extc/extc_stubs.o
+
 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
@@ -26,7 +28,7 @@ libs:
 	(cd libs/xml-light; make xml-light.cmxa)
 
 haxe: $(MODULES:=.cmx)
-	ocamlopt -o $(OUTPUT) $(LIBS) $(MODULES:=.cmx)
+	ocamlopt -o $(OUTPUT) $(NATIVE_LIBS) $(LIBS) $(MODULES:=.cmx)
 
 codegen.cmx: typeload.cmx typecore.cmx type.cmx genxml.cmx common.cmx ast.cmx
 

+ 1 - 1
Makefile.win

@@ -1,6 +1,6 @@
 include Makefile
 
-LIBS += shell32.lib libs/extc/extc_stubs.obj libs/extc/zlib/zlib.lib
+NATIVE_LIBS = shell32.lib libs/extc/extc_stubs.obj libs/extc/zlib/zlib.lib
 
 FILTER=sed 's/File "\([^"]\+\)", line \([0-9]\+\), \(.*\)/\1(\2): \3/' tmp.cmi