New pthreads version. Use gettext.

	* gtk/makefile.{cygwin,msc}: New pthreads version. Use gettext.

9 files changed, 33 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index b017826940..e67d24854b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1999-07-03  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk/makefile.{cygwin,msc}: New pthreads version. Use gettext.
+
 Mon Jun 28 10:03:07 1999  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkimage.c (gdk_image_get): bpl was set wrong for
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b017826940..e67d24854b 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+1999-07-03  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk/makefile.{cygwin,msc}: New pthreads version. Use gettext.
+
 Mon Jun 28 10:03:07 1999  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkimage.c (gdk_image_get): bpl was set wrong for
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b017826940..e67d24854b 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+1999-07-03  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk/makefile.{cygwin,msc}: New pthreads version. Use gettext.
+
 Mon Jun 28 10:03:07 1999  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkimage.c (gdk_image_get): bpl was set wrong for
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b017826940..e67d24854b 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+1999-07-03  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk/makefile.{cygwin,msc}: New pthreads version. Use gettext.
+
 Mon Jun 28 10:03:07 1999  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkimage.c (gdk_image_get): bpl was set wrong for
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b017826940..e67d24854b 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+1999-07-03  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk/makefile.{cygwin,msc}: New pthreads version. Use gettext.
+
 Mon Jun 28 10:03:07 1999  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkimage.c (gdk_image_get): bpl was set wrong for
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b017826940..e67d24854b 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+1999-07-03  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk/makefile.{cygwin,msc}: New pthreads version. Use gettext.
+
 Mon Jun 28 10:03:07 1999  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkimage.c (gdk_image_get): bpl was set wrong for
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b017826940..e67d24854b 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+1999-07-03  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk/makefile.{cygwin,msc}: New pthreads version. Use gettext.
+
 Mon Jun 28 10:03:07 1999  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk/win32/gdkimage.c (gdk_image_get): bpl was set wrong for
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)