diff options
| author | Tor Lillqvist <tml@src.gnome.org> | 1999-07-03 02:13:51 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 1999-07-03 02:13:51 +0000 |
| commit | d5d599c2291c18dba71fd25a58f4db2661911bea (patch) | |
| tree | dc0bbbe6c6093c216eef1ab9253ea5459431308e /gtk | |
| parent | f178fb5bb71f4e3cd4d8380eb91fb565281cfa97 (diff) | |
| download | gtk+-d5d599c2291c18dba71fd25a58f4db2661911bea.tar.gz | |
New pthreads version. Use gettext.
* gtk/makefile.{cygwin,msc}: New pthreads version. Use gettext.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/makefile.cygwin | 7 | ||||
| -rwxr-xr-x | gtk/makefile.msc | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/gtk/makefile.cygwin b/gtk/makefile.cygwin index af42316df0..b443257742 100644 --- a/gtk/makefile.cygwin +++ b/gtk/makefile.cygwin @@ -7,7 +7,7 @@ BIN = /bin # This is the location of pthreads for Win32, # see http://sourceware.cygnus.com/pthreads-win32/ -PTHREADS = ../../pthreads-snap-1999-04-07 +PTHREADS = ../../pthreads-snap-1999-05-30 PTHREAD_LIB = -L $(PTHREADS) -lpthread PTHREAD_INC = -I $(PTHREADS) @@ -32,8 +32,9 @@ GTK_VER=1.3 GDKSYSDEP = ../gdk/win32 GLIB = ../../glib +GETTEXT = ../../gettext-0.10.35 -CFLAGS = $(OPTIMIZE) -I. -I.. -I$(GDKSYSDEP) -I$(GLIB) -I$(GLIB)/gmodule -DGTK_DISABLE_COMPAT_H +CFLAGS = $(OPTIMIZE) -I. -I.. -I$(GDKSYSDEP) -I$(GLIB) -I$(GLIB)/gmodule -I$(GETTEXT)/intl -DGTK_DISABLE_COMPAT_H all : \ ../config.h \ @@ -319,7 +320,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 $(GLIB) -lglib-$(GLIB_VER) -lgmodule-$(GLIB_VER) -lgdi32 -luser32 + $(GLIB)/build-dll gtk $(GTK_VER) gtk.def $(gtk_OBJECTS) -L $(GDKSYSDEP) -lgdk-$(GTK_VER) -L$(GETTEXT)/intl -lgnu-intl -L $(GLIB) -lglib-$(GLIB_VER) -lgmodule-$(GLIB_VER) -lgdi32 -luser32 # General rule for compiling the objects into the DLL .c.o : diff --git a/gtk/makefile.msc b/gtk/makefile.msc index d5e1d839f4..24f0eccb54 100755 --- a/gtk/makefile.msc +++ b/gtk/makefile.msc @@ -7,7 +7,7 @@ BIN = C:\bin # This is the location of pthreads for Win32, # see http://sourceware.cygnus.com/pthreads-win32/ -PTHREADS = ..\..\pthreads-snap-1999-04-07 +PTHREADS = ..\..\pthreads-snap-1999-05-30 PTHREAD_LIB = $(PTHREADS)\pthread.lib PTHREAD_INC = -I $(PTHREADS) |