2003/04/10 08:10:36

darcs-hash:20040130065842-2ba56-48a83b106a44bd870e2825ea1003812ed1ce3d9e.gz

diff --git a/Makefile b/Makefile
index 400950d..65b56b7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,8 @@ debug                  :=
 gcc_flags              := $(gcc_optimizations) $(debug) -ffunction-sections -fdata-sections -Isrc/org/ijg
 gcj_flags              := -fCLASSPATH=bin 
 gcj                    := $(gcc_path)/bin/$(target)-gcj $(gcj_flags) $(gcc_flags)
-gcc                    := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
+g++                    := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
+gcc                    := $(gcc_path)/bin/$(target)-gcc $(gcc_flags)
 gcjh                   := $(gcc_path)/bin/$(target)-gcjh
 ar                     := $(gcc_path)/$(target)/bin/ar
 strip                  := $(gcc_path)/$(target)/bin/strip
@@ -138,7 +139,7 @@ gcj: compile $(gcc_path)/bin/$(target)-gcj .headers link
 link: $(java_objects) $(cc_objects) $(c_objects) bin-$(platform)/org/xwt/builtin.o
        echo "linking        .o -> $(target_bin)"
        $(ar) r bin-$(platform)/org/xwt/plat/platform.ar bin-$(platform)/org/xwt/plat/*.o
-       $(gcj) --main=org.xwt.Main -o bin-$(platform)/$(target_bin) $^ $(platform_link) bin-$(platform)/org/xwt/plat/platform.ar
+       $(gcj) --main=org.xwt.Main -o bin-$(platform)/$(target_bin) $^ -lstdc++ $(platform_link) bin-$(platform)/org/xwt/plat/platform.ar
 
 .headers: $(java_classes)
        cd bin; for A in `find * -name \*.class`; do \
@@ -167,7 +168,7 @@ $(java_objects): bin-$(platform)/%.java.o: src/%.java $(java_classes)
 $(cc_objects): bin-$(platform)/%.cc.o: src/%.cc src/org/ijg/jmorecfg.h
        @echo "compiling     .cc -> .o:     $<"
        @mkdir -p `dirname $@`
-       $(gcc) -Ibin -c $< -o $@
+       $(g++) -Ibin -c $< -o $@
 
 $(c_objects): bin-$(platform)/%.c.o: src/%.c src/org/ijg/jmorecfg.h
        @echo "compiling      .c -> .o:     $<"