X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=31e8bda3ea30b4e9dfef288851ca05d1ff5021ef;hb=ea6158f8d2c01b2a2fc1825c43e1f3eb560db08f;hp=fc86d9c18d325fea7f7ca30a5fe1432f3e0e60b4;hpb=f3659e9aa15a1f3496a37ad239ae173fb43bc2bc;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index fc86d9c..31e8bda 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,7 @@ compile: .javac .bootclasspath bin/org/xwt/builtin.xwar
 		grep -v ^\\[read | sed s_^\\[write\ bin/__ | sed s_.class\\]_.java_ | sed "s_^_compiling   .java -> .class: src/_"
 
 # platforms
-all: Win32 Linux Java2 Darwin Carbon
+all: Win32 Linux Java2
 
 .javac:
 	if \
@@ -226,7 +226,7 @@ Win32:
 		platform=Win32 \
 		target=i686-pc-mingw32 \
 		target_bin=xwt.exe \
-		platform_link="-Wl,--subsystem,windows -lcomdlg32" \
+		platform_link="-Wl,--subsystem,console -lcomdlg32" \
 		platform_java_sources="Win32"
 
 Darwin: upstream
@@ -242,7 +242,6 @@ Darwin: upstream
 
 Carbon: upstream/Carbon/include/Carbon upstream
 	echo -e "\\n=== Carbon ========================================="
-	cd gcc/install/bin; ln -sf gcjh powerpc-apple-darwin-gcjh
 	make gcj \
 		platform=Carbon \
 		target=powerpc-apple-darwin \
@@ -300,7 +299,7 @@ dist-private:
 	mv gcc gcc-
 	ln -s $(HOME)/dist.xwt.org-gcc gcc
 	mv -f gcc-/Makefile gcc/
-	mv -f gcc-/gcc.patch gcc/
+	mv -f gcc-/*.patch gcc/
 
 	# build it
 	nice -n 19 make all