projects / packages / eclipse.git / blame
| Commit | Line | Data |
|---|---|---|
| af564b00 PS |
1 | --- make_gtk.mak.orig 2004-06-25 18:28:00.000000000 +0200 |
| 2 | +++ make_gtk.mak 2004-07-09 17:20:54.618388592 +0200 | |
| 3 | @@ -24,13 +24,13 @@ | |
| 4 | ||
| 5 | ifeq ($(SWT_PTR_CFLAGS),-DSWT_PTR_SIZE_64) | |
| 6 | # 64 bit path | |
| 7 | -JAVA_HOME = /bluebird/teamswt/swt-builddir/jdk1.5.0 | |
| 8 | +JAVA_HOME = /usr/lib64/java | |
| 9 | AWT_LIB_PATH = $(JAVA_HOME)/jre/lib/amd64 | |
| 10 | XTEST_LIB_PATH = /usr/X11R6/lib64 | |
| 11 | else | |
| 12 | # 32 bit path | |
| 13 | -JAVA_HOME = /bluebird/teamswt/swt-builddir/IBMJava2-141 | |
| 14 | -AWT_LIB_PATH = $(JAVA_HOME)/jre/bin | |
| 15 | +JAVA_HOME = /usr/lib/java | |
| 16 | +AWT_LIB_PATH = $(JAVA_HOME)/jre/lib/i386 | |
| 17 | XTEST_LIB_PATH = /usr/X11R6/lib | |
| 18 | endif | |
| 19 | ||
| 20 | @@ -63,19 +63,20 @@ | |
| 21 | GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` | |
| 22 | GNOMELIBS = `pkg-config --libs gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` | |
| 23 | ||
| 24 | -MOZILLACFLAGS = -O \ | |
| 25 | +MOZILLACFLAGS = $(OPT) \ | |
| 26 | -fno-rtti \ | |
| 27 | -Wall \ | |
| 28 | -I./ \ | |
| 29 | - -I$(JAVA_HOME) \ | |
| 30 | - -include $(MOZILLA_HOME)/include/mozilla-config.h \ | |
| 31 | - -I$(MOZILLA_HOME)/include \ | |
| 32 | - -I$(MOZILLA_HOME)/include/xpcom \ | |
| 33 | - -I$(MOZILLA_HOME)/include/string \ | |
| 34 | - -I$(MOZILLA_HOME)/include/nspr \ | |
| 35 | - -I$(MOZILLA_HOME)/include/embed_base \ | |
| 36 | - -I$(MOZILLA_HOME)/include/gfx | |
| 37 | -MOZILLALIBS = -L$(MOZILLA_HOME)/lib -lembed_base_s -lxpcom | |
| 38 | + -I$(JAVA_HOME)/include \ | |
| 39 | + -I$(JAVA_HOME)/include/linux \ | |
| 40 | + -include /usr/include/mozilla/mozilla-config.h \ | |
| 41 | + -I/usr/include/mozilla \ | |
| 42 | + -I/usr/include/mozilla/embed_base \ | |
| 43 | + -I/usr/include/mozilla/gfx \ | |
| 44 | + -I/usr/include/mozilla/string \ | |
| 45 | + -I/usr/include/mozilla/xpcom \ | |
| 46 | + -I/usr/include/nspr | |
| 47 | +MOZILLALIBS = -L/usr/lib/mozilla/components -lembedcomponents -lxpcom | |
| 48 | MOZILLALDFLAGS = -s | |
| 49 | ||
| 50 | SWT_OBJECTS = swt.o callback.o | |
| 51 | @@ -85,14 +86,15 @@ | |
| 52 | GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o | |
| 53 | MOZILLA_OBJECTS = xpcom.o | |
| 54 | ||
| 55 | -CFLAGS = -O -Wall \ | |
| 56 | +CFLAGS = $(OPT) -Wall \ | |
| 57 | -DSWT_VERSION=$(SWT_VERSION) \ | |
| 58 | -DLINUX -DGTK \ | |
| 59 | -I$(JAVA_HOME)/include \ | |
| 60 | - -fpic \ | |
| 61 | + -I$(JAVA_HOME)/include/linux \ | |
| 62 | + -fPIC \ | |
| 63 | ${SWT_PTR_CFLAGS} | |
| 64 | ||
| 65 | -LIBS = -shared -fpic | |
| 66 | +LIBS = -shared -fPIC | |
| 67 | ||
| 68 | # | |
| 69 | # Target Rules |