diff -ur src-orig/make_linux.mak src/make_linux.mak --- src-orig/make_linux.mak Thu May 5 17:13:42 2005 +++ src/make_linux.mak Sat Aug 6 11:31:58 2005 @@ -13,6 +13,9 @@ include make_common.mak +CC = cc +LD = cc + SWT_VERSION=$(maj_ver)$(min_ver) # Define the various shared libraries to be build. @@ -24,28 +27,30 @@ ATK_PREFIX = swt-atk GNOME_PREFIX = swt-gnome MOZILLA_PREFIX = swt-mozilla -SWT_LIB = lib$(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -AWT_LIB = lib$(AWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -SWTPI_LIB = lib$(SWTPI_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -CAIRO_LIB = lib$(CAIRO_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -ATK_LIB = lib$(ATK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -GNOME_LIB = lib$(GNOME_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -MOZILLA_LIB = lib$(MOZILLA_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so +SWT_LIB = lib$(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).jnilib +AWT_LIB = lib$(AWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).jnilib +SWTPI_LIB = lib$(SWTPI_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).jnilib +CAIRO_LIB = lib$(CAIRO_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).jnilib +ATK_LIB = lib$(ATK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).jnilib +GNOME_LIB = lib$(GNOME_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).jnilib +MOZILLA_LIB = lib$(MOZILLA_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).jnilib CAIROCFLAGS = `pkg-config --cflags cairo` CAIROLIBS = `pkg-config --libs-only-L cairo` -lcairo +XTEST_LIB_PATH = /usr/X11R6/lib + # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) GTKCFLAGS = `pkg-config --cflags gtk+-2.0` -GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(XTEST_LIB_PATH) -lXtst +GTKLIBS = `pkg-config --libs gtk+-2.0 gthread-2.0` -L$(XTEST_LIB_PATH) -lXtst AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt -shared -s ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0` -ATKLIBS = `pkg-config --libs-only-L atk gtk+-2.0`-latk-1.0 -lgtk-x11-2.0 +ATKLIBS = `pkg-config --libs atk gtk+-2.0` GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2 +GNOMELIBS = `pkg-config --libs gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` # Uncomment for Native Stats tool #NATIVE_STATS = -DNATIVE_STATS @@ -81,12 +86,12 @@ -DLINUX -DGTK \ -I$(JAVA_HOME)/include \ -I$(JAVA_HOME)/include/linux \ - -fpic \ + -I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers/ \ ${SWT_PTR_CFLAGS} -LIBS = -shared -fpic -s +LIBS = -bundle -framework JavaVM -all: make_swt make_atk make_gnome make_awt +all: make_swt make_atk make_gnome # # SWT libs diff -ur src-orig/os_custom.h src/os_custom.h --- src-orig/os_custom.h Fri Jun 17 11:38:44 2005 +++ src/os_custom.h Sat Aug 6 11:31:04 2005 @@ -21,31 +21,31 @@ #define PTR_sizeof() sizeof(void *) /* Libraries for dynamic loaded functions */ -#define gtk_file_chooser_add_filter_LIB "libgtk-x11-2.0.so.0" -#define gtk_file_chooser_dialog_new_LIB "libgtk-x11-2.0.so.0" -#define gtk_file_chooser_get_current_folder_LIB "libgtk-x11-2.0.so.0" -#define gtk_file_chooser_get_filename_LIB "libgtk-x11-2.0.so.0" -#define gtk_file_chooser_get_filenames_LIB "libgtk-x11-2.0.so.0" -#define gtk_file_chooser_set_current_folder_LIB "libgtk-x11-2.0.so.0" -#define gtk_file_chooser_set_current_name_LIB "libgtk-x11-2.0.so.0" -#define gtk_file_chooser_set_extra_widget_LIB "libgtk-x11-2.0.so.0" -#define gtk_file_chooser_set_filename_LIB "libgtk-x11-2.0.so.0" -#define gtk_file_chooser_set_select_multiple_LIB "libgtk-x11-2.0.so.0" -#define gtk_file_filter_add_pattern_LIB "libgtk-x11-2.0.so.0" -#define gtk_file_filter_new_LIB "libgtk-x11-2.0.so.0" -#define gtk_file_filter_set_name_LIB "libgtk-x11-2.0.so.0" -#define gtk_tree_selection_get_selected_rows_LIB "libgtk-x11-2.0.so.0" -#define gtk_tree_view_column_cell_get_position_LIB "libgtk-x11-2.0.so.0" -#define gtk_entry_set_alignment_LIB "libgtk-x11-2.0.so.0" -#define gdk_draw_pixbuf_LIB "libgdk-x11-2.0.so.0" -#define gdk_screen_get_default_LIB "libgdk-x11-2.0.so.0" -#define gdk_screen_get_monitor_at_window_LIB "libgdk-x11-2.0.so.0" -#define gdk_screen_get_monitor_geometry_LIB "libgdk-x11-2.0.so.0" -#define gdk_screen_get_n_monitors_LIB "libgdk-x11-2.0.so.0" -#define gdk_screen_get_number_LIB "libgdk-x11-2.0.so.0" -#define gdk_window_set_keep_above_LIB "libgdk-x11-2.0.so.0" -#define gdk_window_set_accept_focus_LIB "libgdk-x11-2.0.so.0" -#define gdk_x11_screen_get_window_manager_name_LIB "libgdk-x11-2.0.so.0" +#define gtk_file_chooser_add_filter_LIB "libgtk-x11-2.0.0.dylib" +#define gtk_file_chooser_dialog_new_LIB "libgtk-x11-2.0.0.dylib" +#define gtk_file_chooser_get_current_folder_LIB "libgtk-x11-2.0.0.dylib" +#define gtk_file_chooser_get_filename_LIB "libgtk-x11-2.0.0.dylib" +#define gtk_file_chooser_get_filenames_LIB "libgtk-x11-2.0.0.dylib" +#define gtk_file_chooser_set_current_folder_LIB "libgtk-x11-2.0.0.dylib" +#define gtk_file_chooser_set_current_name_LIB "libgtk-x11-2.0.0.dylib" +#define gtk_file_chooser_set_extra_widget_LIB "libgtk-x11-2.0.0.dylib" +#define gtk_file_chooser_set_filename_LIB "libgtk-x11-2.0.0.dylib" +#define gtk_file_chooser_set_select_multiple_LIB "libgtk-x11-2.0.0.dylib" +#define gtk_file_filter_add_pattern_LIB "libgtk-x11-2.0.0.dylib" +#define gtk_file_filter_new_LIB "libgtk-x11-2.0.0.dylib" +#define gtk_file_filter_set_name_LIB "libgtk-x11-2.0.0.dylib" +#define gtk_tree_selection_get_selected_rows_LIB "libgtk-x11-2.0.0.dylib" +#define gtk_tree_view_column_cell_get_position_LIB "libgtk-x11-2.0.0.dylib" +#define gtk_entry_set_alignment_LIB "libgtk-x11-2.0.0.dylib" +#define gdk_draw_pixbuf_LIB "libgdk-x11-2.0.0.dylib" +#define gdk_screen_get_default_LIB "libgdk-x11-2.0.0.dylib" +#define gdk_screen_get_monitor_at_window_LIB "libgdk-x11-2.0.0.dylib" +#define gdk_screen_get_monitor_geometry_LIB "libgdk-x11-2.0.0.dylib" +#define gdk_screen_get_n_monitors_LIB "libgdk-x11-2.0.0.dylib" +#define gdk_screen_get_number_LIB "libgdk-x11-2.0.0.dylib" +#define gdk_window_set_keep_above_LIB "libgdk-x11-2.0.0.dylib" +#define gdk_window_set_accept_focus_LIB "libgdk-x11-2.0.0.dylib" +#define gdk_x11_screen_get_window_manager_name_LIB "libgdk-x11-2.0.0.dylib" /* Field accessors */ #define GTK_ACCEL_LABEL_SET_ACCEL_STRING(arg0, arg1) (arg0)->accel_string = arg1 Only in src: os_custom.o Only in src: os_stats.o Only in src: os_structs.o Only in src: swt.o