Add G_SQRT2.
* app/appenv.h: Add G_SQRT2.
* app/iscissors.c: Use it.
* app/makefile.{cygwin,msc}: Add new files.
* */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 in GTk+, so use it here, too).
This commit is contained in:
@ -37,9 +37,9 @@ GLIB_VER = 1.3
|
||||
|
||||
GTK = ..\..\gtk+
|
||||
GLIB = ..\..\glib
|
||||
GETTEXT = ..\..\gettext-0.10.35
|
||||
INTL = ..\..\intl
|
||||
|
||||
CFLAGS = -I.. -I$(GLIB) -I$(GTK)\gdk\win32 -I$(GTK) -I$(GETTEXT)\intl -DGIMPDIR=\"$(GIMPDIR)\"
|
||||
CFLAGS = -I.. -I$(GLIB) -I$(GTK)\gdk\win32 -I$(GTK) -I$(INTL) -DGIMPDIR=\"$(GIMPDIR)\"
|
||||
|
||||
all : \
|
||||
..\config.h \
|
||||
@ -91,7 +91,7 @@ gimp_OBJECTS = \
|
||||
parasite.obj
|
||||
|
||||
gimp-$(GIMP_VER).dll : $(gimp_OBJECTS) gimp.def
|
||||
$(CC) $(CFLAGS) -LD -Fegimp-$(GIMP_VER).dll $(gimp_OBJECTS) $(GETTEXT)\intl\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS) user32.lib /def:gimp.def
|
||||
$(CC) $(CFLAGS) -LD -Fegimp-$(GIMP_VER).dll $(gimp_OBJECTS) $(INTL)\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS) user32.lib /def:gimp.def
|
||||
|
||||
# Pass -DLIBGIMP_COMPILATION when compiling gimp_OBJECTS
|
||||
|
||||
@ -140,7 +140,7 @@ gimpui_OBJECTS = \
|
||||
gimppatternmenu.obj
|
||||
|
||||
gimpui-$(GIMP_VER).dll : $(gimpui_OBJECTS) gimpui.def
|
||||
$(CC) $(CFLAGS) -LD -Fegimpui-$(GIMP_VER).dll $(gimpui_OBJECTS) gimp-$(GIMP_VER).lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\win32\gdk-$(GTK_VER).lib $(GETTEXT)\intl\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS) /def:gimpui.def
|
||||
$(CC) $(CFLAGS) -LD -Fegimpui-$(GIMP_VER).dll $(gimpui_OBJECTS) gimp-$(GIMP_VER).lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\win32\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS) /def:gimpui.def
|
||||
|
||||
gimpmenu.obj : gimpmenu.c
|
||||
$(CC) $(CFLAGS) -GD -c gimpmenu.c
|
||||
|
||||
Reference in New Issue
Block a user