Commit 7944e647 authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist

Fix typo.

1999-11-21  Tor Lillqvist  <tml@iki.fi>

* gdk/gdk.c (gdk_keyval_convert_case): Fix typo.

* gdk/gdkconfig.h.win32: New file.

* gdk/win32/makefile.cygwin: Build just a static archive here.

* gdk/makefile.cygwin: New file. Get the win32-specific stuff
for the DLL from the static archive built above.

* gdk/gdk.def: Moved here from the win32 subdirectory.

* gdk/win32/*: Adapt for the changed private struct organisation.

* gtk/makefile.{cygwin,msc}: Get gdk library from ../gdk now.
parent 09240118
1999-11-21 Tor Lillqvist <tml@iki.fi>
* gdk/gdk.c (gdk_keyval_convert_case): Fix typo.
* gdk/gdkconfig.h.win32: New file.
* gdk/win32/makefile.cygwin: Build just a static archive here.
* gdk/makefile.cygwin: New file. Get the win32-specific stuff
for the DLL from the static archive built above.
* gdk/gdk.def: Moved here from the win32 subdirectory.
* gdk/win32/*: Adapt for the changed private struct organisation.
* gtk/makefile.{cygwin,msc}: Get gdk library from ../gdk now.
Sun Nov 21 16:44:35 1999 Stefan Jeske <stefan@gtk.org>
* gtk/gtkspinbutton.c (gtk_spin_button_button_press): Added support
......
1999-11-21 Tor Lillqvist <tml@iki.fi>
* gdk/gdk.c (gdk_keyval_convert_case): Fix typo.
* gdk/gdkconfig.h.win32: New file.
* gdk/win32/makefile.cygwin: Build just a static archive here.
* gdk/makefile.cygwin: New file. Get the win32-specific stuff
for the DLL from the static archive built above.
* gdk/gdk.def: Moved here from the win32 subdirectory.
* gdk/win32/*: Adapt for the changed private struct organisation.
* gtk/makefile.{cygwin,msc}: Get gdk library from ../gdk now.
Sun Nov 21 16:44:35 1999 Stefan Jeske <stefan@gtk.org>
* gtk/gtkspinbutton.c (gtk_spin_button_button_press): Added support
......
1999-11-21 Tor Lillqvist <tml@iki.fi>
* gdk/gdk.c (gdk_keyval_convert_case): Fix typo.
* gdk/gdkconfig.h.win32: New file.
* gdk/win32/makefile.cygwin: Build just a static archive here.
* gdk/makefile.cygwin: New file. Get the win32-specific stuff
for the DLL from the static archive built above.
* gdk/gdk.def: Moved here from the win32 subdirectory.
* gdk/win32/*: Adapt for the changed private struct organisation.
* gtk/makefile.{cygwin,msc}: Get gdk library from ../gdk now.
Sun Nov 21 16:44:35 1999 Stefan Jeske <stefan@gtk.org>
* gtk/gtkspinbutton.c (gtk_spin_button_button_press): Added support
......
1999-11-21 Tor Lillqvist <tml@iki.fi>
* gdk/gdk.c (gdk_keyval_convert_case): Fix typo.
* gdk/gdkconfig.h.win32: New file.
* gdk/win32/makefile.cygwin: Build just a static archive here.
* gdk/makefile.cygwin: New file. Get the win32-specific stuff
for the DLL from the static archive built above.
* gdk/gdk.def: Moved here from the win32 subdirectory.
* gdk/win32/*: Adapt for the changed private struct organisation.
* gtk/makefile.{cygwin,msc}: Get gdk library from ../gdk now.
Sun Nov 21 16:44:35 1999 Stefan Jeske <stefan@gtk.org>
* gtk/gtkspinbutton.c (gtk_spin_button_button_press): Added support
......
1999-11-21 Tor Lillqvist <tml@iki.fi>
* gdk/gdk.c (gdk_keyval_convert_case): Fix typo.
* gdk/gdkconfig.h.win32: New file.
* gdk/win32/makefile.cygwin: Build just a static archive here.
* gdk/makefile.cygwin: New file. Get the win32-specific stuff
for the DLL from the static archive built above.
* gdk/gdk.def: Moved here from the win32 subdirectory.
* gdk/win32/*: Adapt for the changed private struct organisation.
* gtk/makefile.{cygwin,msc}: Get gdk library from ../gdk now.
Sun Nov 21 16:44:35 1999 Stefan Jeske <stefan@gtk.org>
* gtk/gtkspinbutton.c (gtk_spin_button_button_press): Added support
......
1999-11-21 Tor Lillqvist <tml@iki.fi>
* gdk/gdk.c (gdk_keyval_convert_case): Fix typo.
* gdk/gdkconfig.h.win32: New file.
* gdk/win32/makefile.cygwin: Build just a static archive here.
* gdk/makefile.cygwin: New file. Get the win32-specific stuff
for the DLL from the static archive built above.
* gdk/gdk.def: Moved here from the win32 subdirectory.
* gdk/win32/*: Adapt for the changed private struct organisation.
* gtk/makefile.{cygwin,msc}: Get gdk library from ../gdk now.
Sun Nov 21 16:44:35 1999 Stefan Jeske <stefan@gtk.org>
* gtk/gtkspinbutton.c (gtk_spin_button_button_press): Added support
......
1999-11-21 Tor Lillqvist <tml@iki.fi>
* gdk/gdk.c (gdk_keyval_convert_case): Fix typo.
* gdk/gdkconfig.h.win32: New file.
* gdk/win32/makefile.cygwin: Build just a static archive here.
* gdk/makefile.cygwin: New file. Get the win32-specific stuff
for the DLL from the static archive built above.
* gdk/gdk.def: Moved here from the win32 subdirectory.
* gdk/win32/*: Adapt for the changed private struct organisation.
* gtk/makefile.{cygwin,msc}: Get gdk library from ../gdk now.
Sun Nov 21 16:44:35 1999 Stefan Jeske <stefan@gtk.org>
* gtk/gtkspinbutton.c (gtk_spin_button_button_press): Added support
......
......@@ -507,7 +507,7 @@ gdk_keyval_convert_case (guint symbol,
guint xlower = symbol;
guint xupper = symbol;
switch (sym >> 8)
switch (symbol >> 8)
{
#if defined (GDK_A) && defined (GDK_Ooblique)
case 0: /* Latin 1 */
......
EXPORTS
gdk_atom_intern
gdk_atom_name
gdk_beep
gdk_bitmap_create_from_data
gdk_char_height
gdk_char_measure
gdk_char_width
gdk_char_width_wc
gdk_color_alloc
gdk_color_black
gdk_color_change
gdk_color_copy
gdk_color_equal
gdk_color_free
gdk_color_hash
gdk_color_parse
gdk_color_white
gdk_colormap_alloc_color
gdk_colormap_alloc_colors
gdk_colormap_change
gdk_colormap_free_colors
gdk_colormap_get_system
gdk_colormap_get_system_size
gdk_colormap_get_visual
gdk_colormap_new
gdk_colormap_ref
gdk_colormap_unref
gdk_colors_alloc
gdk_colors_free
gdk_colors_store
gdk_cursor_destroy
gdk_cursor_new
gdk_cursor_new_from_pixmap
gdk_dnd_init
gdk_drag_abort
gdk_drag_begin
gdk_drag_context_new
gdk_drag_context_ref
gdk_drag_context_unref
gdk_drag_drop
gdk_drag_find_window
gdk_drag_get_protocol
gdk_drag_get_selection
gdk_drag_motion
gdk_drag_status
gdk_draw_arc
gdk_draw_drawable
gdk_draw_gray_image
gdk_draw_image
gdk_draw_indexed_image
gdk_draw_line
gdk_draw_lines
gdk_draw_point
gdk_draw_points
gdk_draw_polygon
gdk_draw_rectangle
gdk_draw_rgb_32_image
gdk_draw_rgb_image
gdk_draw_rgb_image_dithalign
gdk_draw_segments
gdk_draw_string
gdk_draw_text
gdk_draw_text_wc
gdk_drawable_alloc
gdk_drawable_get_colormap
gdk_drawable_get_size
gdk_drawable_get_type
gdk_drawable_get_visual
gdk_drawable_ref
gdk_drawable_set_colormap
gdk_drawable_set_data
gdk_drawable_unref
gdk_drop_finish
gdk_drop_reply
gdk_error_code
gdk_error_trap_pop
gdk_error_trap_push
gdk_error_warnings
gdk_event_button_generate
gdk_event_copy
gdk_event_data
gdk_event_free
gdk_event_func
gdk_event_get
gdk_event_get_graphics_expose
gdk_event_get_time
gdk_event_handler_set
gdk_event_new
gdk_event_peek
gdk_event_put
gdk_event_queue_append
gdk_event_queue_find_first
gdk_event_queue_remove_link
gdk_event_send_client_message
gdk_event_send_clientmessage_toall
gdk_event_unqueue
gdk_events_pending
gdk_exit
gdk_flush
gdk_font_equal
gdk_font_id
gdk_font_list_free
gdk_font_list_new
gdk_font_load
gdk_font_ref
gdk_font_unref
gdk_font_full_name_get
gdk_font_full_name_free
gdk_fontset_load
gdk_free_compound_text
gdk_free_text_list
gdk_gc_alloc
gdk_gc_copy
gdk_gc_get_values
gdk_gc_new
gdk_gc_new_with_values
gdk_gc_ref
gdk_gc_set_background
gdk_gc_set_clip_mask
gdk_gc_set_clip_origin
gdk_gc_set_clip_rectangle
gdk_gc_set_clip_region
gdk_gc_set_dashes
gdk_gc_set_exposures
gdk_gc_set_fill
gdk_gc_set_font
gdk_gc_set_foreground
gdk_gc_set_function
gdk_gc_set_line_attributes
gdk_gc_set_stipple
gdk_gc_set_subwindow
gdk_gc_set_tile
gdk_gc_set_ts_origin
gdk_gc_unref
gdk_get_display
gdk_get_show_events
gdk_get_use_xshm
gdk_ic_destroy
gdk_ic_get_attr
gdk_ic_get_events
gdk_ic_get_style
gdk_ic_get_values
gdk_ic_new
gdk_ic_set_attr
gdk_ic_set_values
gdk_im_begin
gdk_im_decide_style
gdk_im_end
gdk_im_ready
gdk_im_set_best_style
gdk_image_bitmap_new
gdk_image_get
gdk_image_get_pixel
gdk_image_new
gdk_image_new_bitmap
gdk_image_put_pixel
gdk_image_ref
gdk_image_unref
gdk_init
gdk_init_check
gdk_input_add
gdk_input_add_full
gdk_input_exit
gdk_input_init
gdk_input_list_devices
gdk_input_motion_events
gdk_input_remove
gdk_input_set_axes
gdk_input_set_extension_events
gdk_input_set_key
gdk_input_set_mode
gdk_input_set_source
gdk_input_window_get_pointer
gdk_key_repeat_disable
gdk_key_repeat_restore
gdk_keyboard_grab
gdk_keyboard_ungrab
gdk_keyval_from_name
gdk_keyval_is_lower
gdk_keyval_is_upper
gdk_keyval_name
gdk_keyval_to_lower
gdk_keyval_to_upper
gdk_list_visuals
gdk_mbstowcs
gdk_null_window_warnings
gdk_pixmap_colormap_create_from_xpm
gdk_pixmap_colormap_create_from_xpm_d
gdk_pixmap_create_from_data
gdk_pixmap_create_from_xpm
gdk_pixmap_create_from_xpm_d
gdk_pixmap_create_on_shared_image
gdk_pixmap_foreign_new
gdk_pixmap_new
gdk_pointer_grab
gdk_pointer_is_grabbed
gdk_pointer_ungrab
gdk_progclass
gdk_property_change
gdk_property_delete
gdk_property_get
gdk_query_depths
gdk_query_visual_types
gdk_rectangle_intersect
gdk_rectangle_union
gdk_region_destroy
gdk_region_empty
gdk_region_equal
gdk_region_get_clipbox
gdk_region_new
gdk_region_offset
gdk_region_point_in
gdk_region_polygon
gdk_region_rect_in
gdk_region_shrink
gdk_region_union_with_rect
gdk_regions_intersect
gdk_regions_subtract
gdk_regions_union
gdk_regions_xor
gdk_rgb_cmap_free
gdk_rgb_cmap_new
gdk_rgb_ditherable
gdk_rgb_gc_set_background
gdk_rgb_gc_set_foreground
gdk_rgb_get_cmap
gdk_rgb_get_visual
gdk_rgb_init
gdk_rgb_set_install
gdk_rgb_set_min_colors
gdk_rgb_set_verbose
gdk_rgb_xpixel_from_rgb
gdk_screen_height
gdk_screen_height_mm
gdk_screen_width
gdk_screen_width_mm
gdk_selection_convert
gdk_selection_owner_get
gdk_selection_owner_set
gdk_selection_property
gdk_selection_property_get
gdk_selection_send_notify
gdk_set_locale
gdk_set_show_events
gdk_set_use_xshm
gdk_string_extents
gdk_string_height
gdk_string_measure
gdk_string_to_compound_text
gdk_string_width
gdk_text_extents
gdk_text_extents_wc
gdk_text_height
gdk_text_measure
gdk_text_property_to_text_list
gdk_text_width
gdk_text_width_wc
gdk_threads_enter
gdk_threads_leave
gdk_threads_mutex
gdk_visual_get_best
gdk_visual_get_best_depth
gdk_visual_get_best_type
gdk_visual_get_best_with_both
gdk_visual_get_best_with_depth
gdk_visual_get_best_with_type
gdk_visual_get_system
gdk_visual_ref
gdk_visual_unref
gdk_wcstombs
gdk_window_add_filter
gdk_window_at_pointer
gdk_window_clear
gdk_window_clear_area
gdk_window_clear_area_e
gdk_window_destroy
gdk_window_foreign_new
gdk_window_get_children
gdk_window_get_deskrelative_origin
gdk_window_get_events
gdk_window_get_geometry
gdk_window_get_origin
gdk_window_get_parent
gdk_window_get_pointer
gdk_window_get_position
gdk_window_get_root_origin
gdk_window_get_toplevel
gdk_window_get_toplevels
gdk_window_get_user_data
gdk_window_hide
gdk_window_is_viewable
gdk_window_is_visible
gdk_window_lower
gdk_window_merge_child_shapes
gdk_window_move
gdk_window_move_resize
gdk_window_new
gdk_window_raise
gdk_window_register_dnd
gdk_window_remove_filter
gdk_window_reparent
gdk_window_resize
gdk_window_set_back_pixmap
gdk_window_set_background
gdk_window_set_child_shapes
gdk_window_set_cursor
gdk_window_set_decorations
gdk_window_set_events
gdk_window_set_functions
gdk_window_set_geometry_hints
gdk_window_set_group
gdk_window_set_hints
gdk_window_set_icon
gdk_window_set_icon_name
gdk_window_set_override_redirect
gdk_window_set_role
gdk_window_set_static_gravities
gdk_window_set_title
gdk_window_set_transient_for
gdk_window_set_user_data
gdk_window_shape_combine_mask
gdk_window_show
gdk_window_withdraw
/* Handcrafted for Win32 */
#define GDK_WINDOWING_WIN32
#define GDK_HAVE_WCHAR_H 1
#ifdef _MSC_VER
#define GDK_HAVE_WCTYPE_H 1
#endif
#define GDK_USE_UTF8_MBS 1
## Makefile for building the GDK DLL with gcc-2.95 or later on cygwin
## Use: make -f makefile.cygwin
## You must first build the Win32-dependent sources in the win32 subdirectory.
## There is no install target, you have to decide where and
## how to install for yourself.
OPTIMIZE = -g -O
################################################################
# Nothing much configurable below
CC = gcc -mno-cygwin -mpentium -fnative-struct
CP = cp
LD = ld
GLIB_VER=1.3
GTK_VER=1.3
GLIB = ../../glib
CFLAGS = $(OPTIMIZE) -I . -I .. -I $(GLIB) -DG_ENABLE_DEBUG -DHAVE_CONFIG_H -DGDK_VERSION=\"$(GTK_VER)\"
all: \
../config.h \
gdkconfig.h \
gdk-$(GTK_VER).dll
gdk_OBJECTS = \
gdk.o \
gdkcolor.o \
gdkdraw.o \
gdkevents.o \
gdkfont.o \
gdkgc.o \
gdkglobals.o \
gdkimage.o \
gdkrgb.o \
gdkrectangle.o \
gdkwindow.o
../config.h : ../config.h.win32
$(CP) ../config.h.win32 ../config.h
gdkconfig.h : gdkconfig.h.win32
$(CP) gdkconfig.h.win32 gdkconfig.h
gdk-$(GTK_VER).dll : $(gdk_OBJECTS) gdk.def
$(GLIB)/build-dll gdk $(GTK_VER) gdk.def $(gdk_OBJECTS) -L win32 -lgdk-win32 -lwntab32x -L $(GLIB) -lglib-$(GLIB_VER) -lgdi32 -luser32 -limm32 -lshell32 -lole32 -luuid $(LDFLAGS) win32/gdk-win32res.o
.SUFFIXES: .c .o .i
.c.o :
$(CC) $(CFLAGS) -c -DGDK_COMPILATION -DG_LOG_DOMAIN=\"Gdk\" $<
.c.i :
$(CC) $(CFLAGS) -E -DGDK_COMPILATION -DG_LOG_DOMAIN=\"Gdk\" $< >$@
clean:
-rm *.exe *.o *.dll *.a *.exp *.base
......@@ -24,6 +24,7 @@ CFLAGS = $(OPTIMIZE) -I . -I .. -I ../.. -I $(WTKIT)/include -I $(GLIB) -DG_ENAB
all: \
../../config.h \
../gdkconfig.h \
libgdk-win32.a \
gdk-win32res.o \
libwntab32x.a
......@@ -52,6 +53,9 @@ gdk_win32_OBJECTS = \
../../config.h : ../../config.h.win32
$(CP) ../../config.h.win32 ../../config.h
../gdkconfig.h : ../gdkconfig.h.win32
$(CP) ../gdkconfig.h.win32 ../gdkconfig.h
gdk-win32res.o : rc/gdk.rc
windres --include-dir rc rc/gdk.rc gdk-win32res.o
......
## Makefile for building the GTK DLL with egcs on cygwin
## Use: make -f makefile.cygwin install
## Makefile for building the GTK DLL with gcc-2.95 or later on cygwin
## Use: make -f makefile.cygwin
# Change this to wherever you want to install the DLL. This directory
# should be in your PATH.
BIN = /bin
## There is no install target, you have to decide where and
## how to install for yourself.
# This is the location of pthreads for Win32,
# see http://sourceware.cygnus.com/pthreads-win32/
......@@ -25,16 +24,13 @@ CC = gcc -mno-cygwin -mpentium -fnative-struct
PERL = perl
AWK = awk
INSTALL = install
GLIB_VER=1.3
GTK_VER=1.3
GDKSYSDEP = ../gdk/win32
GLIB = ../../glib
INTL = ../../intl
CFLAGS = $(OPTIMIZE) -I . -I .. -I $(GDKSYSDEP) -I ../gdk -I $(GLIB) -I $(GLIB)/gmodule -I $(INTL) -DGTK_DISABLE_COMPAT_H
CFLAGS = $(OPTIMIZE) -I . -I .. -I ../gdk -I $(GLIB) -I $(GLIB)/gmodule -I $(INTL) -DGTK_DISABLE_COMPAT_H
all : \
../config.h \
......@@ -48,9 +44,6 @@ all : \
testselection.exe \
simple.exe
install : all
$(INSTALL) gtk-$(GTK_VER).dll $(BIN)
gtk_OBJECTS = \
fnmatch.o \
gtkaccelgroup.o \
......@@ -335,7 +328,7 @@ gtkmarshal.h gtkmarshal.c : gtkmarshal.list genmarshal.pl
# Linking:
#
gtk-$(GTK_VER).dll : generated $(gtk_OBJECTS) gtk.def
$(GLIB)/build-dll gtk $(GTK_VER) gtk.def $(gtk_OBJECTS) -L $(GDKSYSDEP) -lgdk-$(GTK_VER) -L$(INTL) -lgnu-intl -L $(GLIB) -lglib-$(GLIB_VER) -lgmodule-$(GLIB_VER) -lgdi32 -luser32
$(GLIB)/build-dll gtk $(GTK_VER) gtk.def $(gtk_OBJECTS) -L ../gdk -lgdk-$(GTK_VER) -L$(INTL) -lgnu-intl -L $(GLIB) -lglib-$(GLIB_VER) -lgmodule-$(GLIB_VER) -lgdi32 -luser32
.SUFFIXES: .c .o .i
......@@ -350,44 +343,44 @@ gtk-$(GTK_VER).dll : generated $(gtk_OBJECTS) gtk.def
# Test programs:
#
testdnd.exe : testdnd.o
$(CC) $(CFLAGS) -o $@ testdnd.o -L . -lgtk-$(GTK_VER) -L $(GDKSYSDEP) -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) $(LDFLAGS)
$(CC) $(CFLAGS) -o $@ testdnd.o -L . -lgtk-$(GTK_VER) -L ../gdk -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) $(LDFLAGS)
# Must have separate rules for these objects that don't go in the DLL
testdnd.o : testdnd.c
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testdnd\" testdnd.c
testgtk.exe : testgtk.o
$(CC) $(CFLAGS) -o $@ testgtk.o -L . -lgtk-$(GTK_VER) -L $(GDKSYSDEP) -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) $(LDFLAGS)
$(CC) $(CFLAGS) -o $@ testgtk.o -L . -lgtk-$(GTK_VER) -L ../gdk -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) $(LDFLAGS)
testgtk.o : testgtk.c
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testgtk\" testgtk.c
testinput.exe : testinput.o
$(CC) $(CFLAGS) -o $@ testinput.o -L . -lgtk-$(GTK_VER) -L $(GDKSYSDEP) -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) $(LDFLAGS)
$(CC) $(CFLAGS) -o $@ testinput.o -L . -lgtk-$(GTK_VER) -L ../gdk -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) $(LDFLAGS)
testinput.o : testinput.c
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testinput\" testinput.c
testrgb.exe : testrgb.o
$(CC) $(CFLAGS) -o $@ testrgb.o -L . -lgtk-$(GTK_VER) -L $(GDKSYSDEP) -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) $(LDFLAGS)
$(CC) $(CFLAGS) -o $@ testrgb.o -L . -lgtk-$(GTK_VER) -L ../gdk -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) $(LDFLAGS)
testrgb.o : testrgb.c
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testrgb\" testrgb.c
testselection.exe : testselection.o
$(CC) $(CFLAGS) -o $@ testselection.o -L . -lgtk-$(GTK_VER) -L $(GDKSYSDEP) -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) $(LDFLAGS)
$(CC) $(CFLAGS) -o $@ testselection.o -L . -lgtk-$(GTK_VER) -L ../gdk -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) $(LDFLAGS)
testselection.o : testselection.c
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testselection\" testselection.c
testthreads.exe : testthreads.o
$(CC) $(CFLAGS) -o $@ testthreads.o -L . -lgtk-$(GTK_VER) -L $(GDKSYSDEP) -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) -lgthread-$(GLIB_VER) $(PTHREAD_LIB) $(LDFLAGS)
$(CC) $(CFLAGS) -o $@ testthreads.o -L . -lgtk-$(GTK_VER) -L ../gdk -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) -lgthread-$(GLIB_VER) $(PTHREAD_LIB) $(LDFLAGS)
testthreads.o : testthreads.c
$(CC) $(CFLAGS) -I$(PTHREAD_INC) -c -DG_LOG_DOMAIN=\"testthreads\" -DUSE_PTHREADS=1 testthreads.c
simple.exe : simple.o
$(CC) $(CFLAGS) -o $@ simple.o -L . -lgtk-$(GTK_VER) -L $(GDKSYSDEP) -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) $(LDFLAGS)
$(CC) $(CFLAGS) -o $@ simple.o -L . -lgtk-$(GTK_VER) -L ../gdk -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) $(LDFLAGS)
simple.o : simple.c
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"simple\" simple.c
......
......@@ -42,11 +42,10 @@ TOUCH = copy makefile.msc+nul
GLIB_VER=1.3
GTK_VER=1.3
GDKSYSDEP = ..\gdk\win32
GLIB = ..\..\glib
INTL = ..\..\intl