projects
/
org.ibex.core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2003/06/28 06:54:18
[org.ibex.core.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
e0a2a23
..
2a6a5df
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-30,11
+30,11
@@
gcc_path := $(shell pwd)/gcc/install
gcc_optimizations := -O2
debug :=
gcc_flags := $(gcc_optimizations) $(debug) -Isrc/org/ijg
gcc_optimizations := -O2
debug :=
gcc_flags := $(gcc_optimizations) $(debug) -Isrc/org/ijg
-gcj_flags := -fCLASSPATH=bin
+gcj_flags := -fCLASSPATH=src
gcj := $(gcc_path)/bin/$(target)-gcj $(gcj_flags) $(gcc_flags)
g++ := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
gcc := $(gcc_path)/bin/$(target)-gcc $(gcc_flags)
gcj := $(gcc_path)/bin/$(target)-gcj $(gcj_flags) $(gcc_flags)
g++ := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
gcc := $(gcc_path)/bin/$(target)-gcc $(gcc_flags)
-gcjh := $(gcc_path)/bin/gcjh
+gcjh := $(gcc_path)/bin/$(target)-gcjh
as := $(gcc_path)/$(target)/bin/as
ar := $(gcc_path)/$(target)/bin/ar
as := $(gcc_path)/$(target)/bin/as
ar := $(gcc_path)/$(target)/bin/ar
@@
-161,10
+161,6
@@
$(java_headers): bin/%.h: bin/%.class
sed s_/_._g | sed s/.class$$// | sed s/.java$$// |\
xargs $(gcjh) --classpath .
sed s_/_._g | sed s/.class$$// | sed s/.java$$// |\
xargs $(gcjh) --classpath .
-# special rule to stop GCJ from choking
-bin-$(platform)/org/xwt/SpecialBoxProperty.java.o: src/org/xwt/SpecialBoxProperty
- $(gcj) -c bin/org/xwt/SpecialBoxProperty*.class -o bin-$(platform)/org/xwt/SpecialBoxProperty.java.o
-
$(java_objects): bin-$(platform)/%.java.o: src/%.java
@echo "compiling .java -> .o: $<"
mkdir -p `dirname $@`
$(java_objects): bin-$(platform)/%.java.o: src/%.java
@echo "compiling .java -> .o: $<"
mkdir -p `dirname $@`
@@
-229,7
+225,8
@@
Win32:
platform=Win32 \
target=i686-pc-mingw32 \
target_bin=xwt.exe \
platform=Win32 \
target=i686-pc-mingw32 \
target_bin=xwt.exe \
- platform_link="-Wl,--subsystem,windows -lcomdlg32"
+ platform_link="-Wl,--subsystem,windows -lcomdlg32" \
+ platform_java_sources="Win32"
Darwin: upstream
echo -e "\\n=== Darwin ========================================="
Darwin: upstream
echo -e "\\n=== Darwin ========================================="