]> gitweb.factorcode.org Git - factor.git/commitdiff
macosx-x86-64
authorDaniel Ehrenberg <ehrenbed@carleton.edu>
Wed, 12 Dec 2007 03:48:20 +0000 (22:48 -0500)
committerDaniel Ehrenberg <ehrenbed@carleton.edu>
Wed, 12 Dec 2007 03:48:20 +0000 (22:48 -0500)
Makefile
vm/Config.macosx.x86.64 [new file with mode: 0644]

index 4c6eb2f4e684c99a610ac146beaca9f6d40a79b3..4228a6f8adbf16afa5491c9685707311024c1874 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -57,12 +57,12 @@ default:
        @echo "openbsd-x86-32"
        @echo "openbsd-x86-64"
        @echo "macosx-x86-32"
+       @echo "macosx-x86-64"
        @echo "macosx-ppc"
        @echo "solaris-x86-32"
        @echo "solaris-x86-64"
        @echo "windows-ce-arm"
        @echo "windows-nt-x86-32"
-       @echo "windows-nt-x86-64"
        @echo ""
        @echo "Additional modifiers:"
        @echo ""
@@ -93,6 +93,9 @@ macosx-ppc: macosx-freetype
 macosx-x86-32: macosx-freetype
        $(MAKE) $(EXECUTABLE) macosx.app CONFIG=vm/Config.macosx.x86.32
 
+macosx-x86-64: macosx-freetype
+       $(MAKE) $(EXECUTABLE) macosx.app CONFIG=vm/Config.macosx.x86.64
+
 linux-x86-32:
        $(MAKE) $(EXECUTABLE) CONFIG=vm/Config.linux.x86.32
 
@@ -114,9 +117,6 @@ solaris-x86-64:
 windows-nt-x86-32:
        $(MAKE) $(EXECUTABLE) CONFIG=vm/Config.windows.nt.x86.32
 
-windows-nt-x86-64:
-       $(MAKE) $(EXECUTABLE) CONFIG=vm/Config.windows.nt.x86.64
-
 windows-ce-arm:
        $(MAKE) $(EXECUTABLE) CONFIG=vm/Config.windows.ce.arm
 
@@ -142,7 +142,7 @@ clean:
        rm -f vm/*.o
 
 vm/resources.o:
-       $(WINDRES) vm/factor.rs vm/resources.o
+       windres vm/factor.rs vm/resources.o
 
 .c.o:
        $(CC) -c $(CFLAGS) -o $@ $<
diff --git a/vm/Config.macosx.x86.64 b/vm/Config.macosx.x86.64
new file mode 100644 (file)
index 0000000..e2063c4
--- /dev/null
@@ -0,0 +1,3 @@
+include vm/Config.macosx
+include vm/Config.x86.64
+CFLAGS += -arch x86_64