summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorTor Lillqvist <tml@src.gnome.org>1999-08-16 04:45:01 +0000
committerTor Lillqvist <tml@src.gnome.org>1999-08-16 04:45:01 +0000
commit0455fa3029a4744fa40ab58bf4f837bfa1890509 (patch)
tree0312e5fec05cad870e9209af2ab541fdc97ae6da /gtk
parent0139b4a3dc5ca5e892534e9d9baae93e66a5b173 (diff)
downloadgdk-pixbuf-0455fa3029a4744fa40ab58bf4f837bfa1890509.tar.gz
Fix start and end radial endpoint calculations which were totally wrong.
* gdk/win32/gdkdraw.c (gdk_draw_arc): Fix start and end radial endpoint calculations which were totally wrong. (A little RTFMing helps a lot ;-) * gtk/makefile.{cygwin,msc}: Use libintl extracted from glibc from a separate directory, not from gettext, because of licensing issues (we want to use the LGPL version). * README.win32: Mention the intl from glibc vs from gettext issue.
Diffstat (limited to 'gtk')
-rw-r--r--gtk/makefile.cygwin6
-rwxr-xr-xgtk/makefile.msc6
2 files changed, 6 insertions, 6 deletions
diff --git a/gtk/makefile.cygwin b/gtk/makefile.cygwin
index be2a52e9f..a104d62ea 100644
--- a/gtk/makefile.cygwin
+++ b/gtk/makefile.cygwin
@@ -32,9 +32,9 @@ GTK_VER=1.3
GDKSYSDEP = ../gdk/win32
GLIB = ../../glib
-GETTEXT = ../../gettext-0.10.35
+INTL = ../../intl
-CFLAGS = $(OPTIMIZE) -I . -I .. -I $(GDKSYSDEP) -I $(GLIB) -I $(GLIB)/gmodule -I $(GETTEXT)/intl -DGTK_DISABLE_COMPAT_H
+CFLAGS = $(OPTIMIZE) -I . -I .. -I $(GDKSYSDEP) -I $(GLIB) -I $(GLIB)/gmodule -I $(INTL) -DGTK_DISABLE_COMPAT_H
all : \
../config.h \
@@ -320,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$(GETTEXT)/intl -lgnu-intl -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$(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 d4a0f9a88..349c0d7b4 100755
--- a/gtk/makefile.msc
+++ b/gtk/makefile.msc
@@ -44,9 +44,9 @@ GTK_VER=1.3
GDKSYSDEP = ..\gdk\win32
GLIB = ..\..\glib
-GETTEXT = ..\..\gettext-0.10.35
+INTL = ..\..\gettext-0.10.35
-CFLAGS = -I. -I.. -I$(GDKSYSDEP) -I$(GLIB) -I$(GLIB)\gmodule -I$(GETTEXT)\intl -DGTK_DISABLE_COMPAT_H
+CFLAGS = -I. -I.. -I$(GDKSYSDEP) -I$(GLIB) -I$(GLIB)\gmodule -I$(INTL) -DGTK_DISABLE_COMPAT_H
all : \
..\config.h \
@@ -333,7 +333,7 @@ gtkmarshal.h gtkmarshal.c : gtkmarshal.list genmarshal.pl
# Linking:
#
gtk-$(GTK_VER).dll : $(gtk_OBJECTS) gtk.def
- $(CC) $(CFLAGS) -LD -Fegtk-$(GTK_VER).dll $(gtk_OBJECTS) $(GDKSYSDEP)\gdk-$(GTK_VER).lib $(GETTEXT)\intl\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(GLIB)\gmodule-$(GLIB_VER).lib gdi32.lib user32.lib $(LDFLAGS) /def:gtk.def
+ $(CC) $(CFLAGS) -LD -Fegtk-$(GTK_VER).dll $(gtk_OBJECTS) $(GDKSYSDEP)\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(GLIB)\gmodule-$(GLIB_VER).lib gdi32.lib user32.lib $(LDFLAGS) /def:gtk.def
# General rule for compiling the objects into the DLL
.c.obj :