updated app/actions/makefile.msc app/menus/makefile.msc : (new files)

2004-07-11  Hans Breuer  <hans@breuer.org>

	* **/makefile.msc : updated
	  app/actions/makefile.msc app/menus/makefile.msc : (new files)
	  app/actions/Makefile.msc app/menus/Makefile.am : added to EXTRA_DIST

	* libgimpbase/gimputils.c libgimpwidgets/gimpmemsizeentry.c
	  app/widgets/gimppropwidgets.c : bumped compiler version check,
	msvc6 still can't cast from unsigned __int64 to double

	* app/actions/debug-actions.c : only use debug_*_callback
	and thus debug_action if ENABLE_DEBUG_MENU

	* app/core/gimpalette-import.c : added gimpwin32-io.h

	* plug-ins/common/convmatrix.c : s/snprintf/g_snprintf/

	* plug-ins/common/screenshot.c : make it compile with msvc,
	but still no win32 specific implementation ...
This commit is contained in:
Hans Breuer 2004-07-11 21:53:17 +00:00 committed by Hans Breuer
parent 5d0d0c2eb8
commit b56eb39ead
26 changed files with 298 additions and 210 deletions

View File

@ -1,3 +1,23 @@
2004-07-11 Hans Breuer <hans@breuer.org>
* **/makefile.msc : updated
app/actions/makefile.msc app/menus/makefile.msc : (new files)
app/actions/Makefile.msc app/menus/Makefile.am : added to EXTRA_DIST
* libgimpbase/gimputils.c libgimpwidgets/gimpmemsizeentry.c
app/widgets/gimppropwidgets.c : bumped compiler version check,
msvc6 still can't cast from unsigned __int64 to double
* app/actions/debug-actions.c : only use debug_*_callback
and thus debug_action if ENABLE_DEBUG_MENU
* app/core/gimpalette-import.c : added gimpwin32-io.h
* plug-ins/common/convmatrix.c : s/snprintf/g_snprintf/
* plug-ins/common/screenshot.c : make it compile with msvc,
but still no win32 specific implementation ...
2004-07-11 Bill Skaggs <weskaggs@primate.ucdavis.edu>
* plug-ins/gfig/gfig-dobject.h: fix commit error that

View File

@ -141,7 +141,8 @@ libappactions_a_SOURCES = \
view-commands.h
EXTRA_DIST =
EXTRA_DIST = \
makefile.msc
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Actions\" \

View File

@ -29,6 +29,7 @@
#include "debug-actions.h"
#include "debug-commands.h"
#ifdef ENABLE_DEBUG_MENU
static GimpActionEntry debug_actions[] =
{
@ -50,13 +51,16 @@ static GimpActionEntry debug_actions[] =
NULL }
};
#endif
void
debug_actions_setup (GimpActionGroup *group)
{
#ifdef ENABLE_DEBUG_MENU
gimp_action_group_add_actions (group,
debug_actions,
G_N_ELEMENTS (debug_actions));
#endif
}
void

115
app/actions/makefile.msc Normal file
View File

@ -0,0 +1,115 @@
PACKAGE = appactions
TOP = ..\..\..
PRJ_TOP = ..\..
!include $(TOP)\glib\build\win32\make.msc
!INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
INCLUDES = \
-FImsvc_recommended_pragmas.h \
-I$(PRJ_TOP) \
-I$(PRJ_TOP)/app \
$(GTK2_CFLAGS) \
DEFINES = \
-DGIMP_COMPILATION \
-DG_LOG_DOMAIN=\"Gimp-Actions\"
all : \
$(PRJ_TOP)\config.h \
$(PACKAGE).lib \
!IFDEF DLLGIMP
$(PACKAGE)-$(PKG_VER).dll
!ENDIF
OBJECTS = \
actions.obj \
brushes-actions.obj \
buffers-actions.obj \
buffers-commands.obj \
channels-actions.obj \
channels-commands.obj \
colormap-editor-actions.obj \
colormap-editor-commands.obj \
context-actions.obj \
context-commands.obj \
data-commands.obj \
debug-actions.obj \
debug-commands.obj \
dialogs-actions.obj \
dialogs-commands.obj \
dockable-actions.obj \
dockable-commands.obj \
documents-actions.obj \
documents-commands.obj \
drawable-actions.obj \
drawable-commands.obj \
edit-actions.obj \
edit-commands.obj \
error-console-actions.obj \
error-console-commands.obj \
file-actions.obj \
file-commands.obj \
file-dialog-actions.obj \
file-dialog-commands.obj \
file-open-actions.obj \
file-save-actions.obj \
fonts-actions.obj \
fonts-commands.obj \
gradient-editor-actions.obj \
gradient-editor-commands.obj \
gradients-actions.obj \
gradients-commands.obj \
help-actions.obj \
help-commands.obj \
image-actions.obj \
image-commands.obj \
images-actions.obj \
images-commands.obj \
layers-actions.obj \
layers-commands.obj \
palette-editor-actions.obj \
palette-editor-commands.obj \
palettes-actions.obj \
palettes-commands.obj \
patterns-actions.obj \
plug-in-actions.obj \
plug-in-commands.obj \
qmask-actions.obj \
qmask-commands.obj \
select-actions.obj \
select-commands.obj \
templates-actions.obj \
templates-commands.obj \
tool-options-actions.obj \
tool-options-commands.obj \
tools-actions.obj \
tools-commands.obj \
vectors-actions.obj \
vectors-commands.obj \
view-actions.obj \
view-commands.obj \
$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
RESOURCE = $(PACKAGE).res
$(PACKAGE).lib : $(OBJECTS)
lib /out:$(PACKAGE).lib $(OBJECTS)
$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def
$(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def
$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
$(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \
user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
gimpcore-$(PKG_VER).dll : $(DLLOBJS) gimpcore.def
$(CC) $(CFLAGS) -LD -Fegimpcore-$(PKG_VER).dll $(DLLOBJS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:gimpcore.def
.c.obj :
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<

View File

@ -30,6 +30,10 @@
#include <glib-object.h>
#ifdef G_OS_WIN32
#include "libgimpbase/gimpwin32-io.h"
#endif
#include "libgimpbase/gimpbase.h"
#include "libgimpcolor/gimpcolor.h"

View File

@ -44,12 +44,12 @@ OBJECTS = \
gimpchannel.obj \
gimpchannel-combine.obj \
gimpchannel-select.obj \
gimpcoords.obj \
gimpcontainer.obj \
gimpcontainer-filter.obj \
gimpcontext.obj \
gimpdata.obj \
gimpdatafactory.obj \
gimpdatalist.obj \
gimp-documents.obj \
gimpdocumentlist.obj \
gimpdrawable.obj \
@ -64,7 +64,6 @@ OBJECTS = \
gimpdrawable-preview.obj \
gimpdrawable-stroke.obj \
gimpdrawable-transform.obj \
# gimpdrawable-transform-utils.obj \
gimpenvirontable.obj \
gimpgradient.obj \
gimpgrid.obj \
@ -80,8 +79,6 @@ OBJECTS = \
gimpimage-flip.obj \
gimpimage-grid.obj \
gimpimage-guides.obj \
# gimpimage-mask.obj \
# gimpimage-mask-select.obj \
gimpimage-merge.obj \
gimpimage-new.obj \
gimpimage-pick-color.obj \
@ -94,7 +91,6 @@ OBJECTS = \
gimpimage-scale.obj \
gimpimage-undo.obj \
gimpimage-undo-push.obj \
gimpimage-unit.obj \
gimpimagefile.obj \
gimpitem.obj \
gimpitem-linked.obj \

View File

@ -40,6 +40,7 @@ OBJECTS = \
gimpdisplayshell-filter-dialog.obj \
gimpdisplayshell-handlers.obj \
gimpdisplayshell-layer-select.obj \
gimpdisplayshell-preview.obj \
gimpdisplayshell-render.obj \
gimpdisplayshell-scale.obj \
gimpdisplayshell-scroll.obj \
@ -48,6 +49,7 @@ OBJECTS = \
gimpdisplayshell-transform.obj \
gimpnavigationview.obj \
gimpprogress.obj \
gimpscalecombobox.obj \
gimpstatusbar.obj \
display-enums.obj \

View File

@ -29,91 +29,35 @@ PKG_LINK = \
OBJECTS = \
about-dialog.obj \
brushes-menu.obj \
brush-select.obj \
buffers-commands.obj \
buffers-menu.obj \
channels-commands.obj \
channels-menu.obj \
colormap-editor-commands.obj \
colormap-editor-menu.obj \
color-history.obj \
color-notebook.obj \
convert-dialog.obj \
data-commands.obj \
debug-commands.obj \
dialogs.obj \
dialogs-commands.obj \
dialogs-menu.obj \
dialogs-constructors.obj \
documents-commands.obj \
documents-menu.obj \
drawable-commands.obj \
edit-commands.obj \
error-console-commands.obj \
error-console-menu.obj \
file-commands.obj \
file-dialog-utils.obj \
file-new-dialog.obj \
file-open-dialog.obj \
file-open-menu.obj \
file-open-location-dialog.obj \
file-save-dialog.obj \
file-save-menu.obj \
font-select.obj \
fonts-commands.obj \
fonts-menu.obj \
gradient-editor-commands.obj \
gradient-editor-menu.obj \
gradients-commands.obj \
gradients-menu.obj \
gradient-select.obj \
grid-dialog.obj \
gui.obj \
gui-vtable.obj \
help-commands.obj \
image-commands.obj \
image-menu.obj \
images-commands.obj \
images-menu.obj \
info-dialog.obj \
info-window.obj \
layers-commands.obj \
layers-menu.obj \
menus.obj \
module-browser.obj \
offset-dialog.obj \
palette-editor-commands.obj \
palette-editor-menu.obj \
palette-import-dialog.obj \
palettes-commands.obj \
palettes-menu.obj \
palette-select.obj \
patterns-menu.obj \
pattern-select.obj \
plug-in-commands.obj \
plug-in-menus.obj \
preferences-dialog.obj \
qmask-commands.obj \
qmask-menu.obj \
quit-dialog.obj \
resize-dialog.obj \
resolution-calibrate-dialog.obj \
select-commands.obj \
session.obj \
splash.obj \
stroke-dialog.obj \
templates-commands.obj \
templates-menu.obj \
themes.obj \
tips-dialog.obj \
tips-parser.obj \
tool-options-commands.obj \
tool-options-menu.obj \
toolbox-menu.obj \
tools-commands.obj \
user-install-dialog.obj \
vectors-commands.obj \
vectors-menu.obj \
view-commands.obj \
INCLUDES = \

View File

@ -15,7 +15,8 @@ includedir = $(PRJ_TOP)
LT_RELEASE = $(PKG_VER)
SUBDIRS = composite paint-funcs base config xcf core file text \
display paint vectors pdb plug-in tools widgets gui
display paint vectors pdb plug-in tools widgets gui \
actions menus
sub-all:
for %d in ($(SUBDIRS)) do nmake -nologo -f makefile.msc sub-one THIS=%d
@ -28,8 +29,10 @@ sub-one:
LDFLAGS = /link /subsystem:console /machine:ix86 $(LINKDEBUG)
PKG_LINK = \
actions/appactions.lib \
config/appconfig.lib \
composite/appcomposite.lib \
menus/appmenus.lib \
paint/apppaint.lib \
paint-funcs/apppaint-funcs.lib \
plug-in/appplug-in.lib \
@ -75,6 +78,10 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK2_CFLAGS) \
!IFNDEF PANGO_WIN32_EXTENDED
$(FONTCONFIG_CFLAGS) \
$(FREETYPE2_CFLAGS) \
!ENDIF
-I$(includedir)
regex_sources = \

View File

@ -25,7 +25,8 @@ libappmenus_a_SOURCES = \
toolbox-menu.h
EXTRA_DIST =
EXTRA_DIST = \
makefile.msc
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Menus\" \

57
app/menus/makefile.msc Normal file
View File

@ -0,0 +1,57 @@
PACKAGE = appmenus
TOP = ..\..\..
PRJ_TOP = ..\..
!include $(TOP)\glib\build\win32\make.msc
!INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
INCLUDES = \
-FImsvc_recommended_pragmas.h \
-I$(PRJ_TOP) \
-I$(PRJ_TOP)/app \
$(GTK2_CFLAGS) \
DEFINES = \
-DGIMP_COMPILATION \
-DG_LOG_DOMAIN=\"Gimp-Menus\"
all : \
$(PRJ_TOP)\config.h \
$(PACKAGE).lib \
!IFDEF DLLGIMP
$(PACKAGE)-$(PKG_VER).dll
!ENDIF
OBJECTS = \
file-dialog-menu.obj \
file-menu.obj \
file-open-menu.obj \
file-save-menu.obj \
image-menu.obj \
menus.obj \
plug-in-menus.obj \
toolbox-menu.obj \
tool-options-menu.obj \
$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
RESOURCE = $(PACKAGE).res
$(PACKAGE).lib : $(OBJECTS)
lib /out:$(PACKAGE).lib $(OBJECTS)
$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def
$(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def
$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
$(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \
user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
gimpcore-$(PKG_VER).dll : $(DLLOBJS) gimpcore.def
$(CC) $(CFLAGS) -LD -Fegimpcore-$(PKG_VER).dll $(DLLOBJS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:gimpcore.def
.c.obj :
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<

View File

@ -29,6 +29,7 @@ OBJECTS = \
gimp-paint.obj \
gimpairbrush.obj \
gimpairbrushoptions.obj \
gimpbrushcore.obj \
gimpclone.obj \
gimpcloneoptions.obj \
gimpconvolve.obj \
@ -37,6 +38,9 @@ OBJECTS = \
gimpdodgeburnoptions.obj \
gimperaser.obj \
gimperaseroptions.obj \
gimpink.obj \
gimpink-blob.obj \
gimpinkoptions.obj \
gimppaintbrush.obj \
gimppaintcore.obj \
gimppaintcore-stroke.obj \

View File

@ -49,6 +49,7 @@ OBJECTS = \
fonts_cmds.obj \
font_select_cmds.obj \
gimprc_cmds.obj \
gradient_edit_cmds.obj \
gradients_cmds.obj \
guides_cmds.obj \
help_cmds.obj \
@ -75,7 +76,7 @@ INCLUDES = \
-FImsvc_recommended_pragmas.h \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GTK2_CFLAGS) \
$(GLIB_CFLAGS) $(GDK_PIXBUF_CFLAGS) \
-I$(includedir)
all : \

View File

@ -55,13 +55,11 @@ OBJECTS = \
gimpfreeselecttool.obj \
gimpfuzzyselecttool.obj \
gimphistogramoptions.obj \
# gimphistogramtool.obj \
gimphuesaturationtool.obj \
gimpimagemapoptions.obj \
gimpimagemaptool.obj \
gimpinkoptions.obj \
gimpinkoptions-gui.obj \
gimpinktool.obj \
gimpinktool-blob.obj \
gimpiscissorstool.obj \
gimplevelstool.obj \
gimpmagnifyoptions.obj \

View File

@ -27,7 +27,6 @@ INCLUDES = \
OBJECTS = \
gimpanchor.obj \
gimpcoordmath.obj \
gimpstroke.obj \
gimpvectors-export.obj \
gimpvectors-import.obj \

View File

@ -26,12 +26,17 @@ PKG_LINK = \
# ..\gui\appgui-$(PKG_VER).lib
OBJECTS = \
gimpaction.obj \
gimpactionfactory.obj \
gimpactiongroup.obj \
gimpbrusheditor.obj \
gimpbrushfactoryview.obj \
gimpbrushselect.obj \
gimpbufferview.obj \
gimpcellrenderertoggle.obj \
gimpcellrendererviewable.obj \
gimpchanneltreeview.obj \
gimpclipboard.obj \
gimpcolorbar.obj \
gimpcolordisplayeditor.obj \
gimpcoloreditor.obj \
@ -39,18 +44,24 @@ OBJECTS = \
gimpcolormapeditor.obj \
gimpcolorpanel.obj \
gimpcomponenteditor.obj \
gimpcontainerbox.obj \
gimpcontainercombobox.obj \
gimpcontainereditor.obj \
gimpcontainerentry.obj \
gimpcontainergridview.obj \
gimpcontainermenu.obj \
gimpcontainermenuimpl.obj \
gimpcontainerpopup.obj \
gimpcontainertreeview.obj \
gimpcontainertreeview-dnd.obj \
gimpcontainerview.obj \
gimpcontainerview-utils.obj \
gimpcontrollerinfo.obj \
gimpcontrollerkeyboard.obj \
gimpcontrollerwheel.obj \
gimpcontrollers.obj \
gimpcursor.obj \
gimpdasheditor.obj \
gimpdataeditor.obj \
gimpdataselect.obj \
gimpdatafactoryview.obj \
gimpdeviceinfo.obj \
gimpdevices.obj \
@ -64,11 +75,17 @@ OBJECTS = \
gimpdocumentview.obj \
gimpdrawabletreeview.obj \
gimpeditor.obj \
gimpenummenu.obj \
gimpenumaction.obj \
gimpenumcombobox.obj \
gimpenumstore.obj \
gimpenumwidgets.obj \
gimperrorconsole.obj \
gimpfgbgeditor.obj \
gimpfiledialog.obj \
gimpfontview.obj \
gimpfontselect.obj \
gimpgradienteditor.obj \
gimpgradientselect.obj \
gimpgrideditor.obj \
gimphelp.obj \
gimphistogrambox.obj \
@ -81,10 +98,13 @@ OBJECTS = \
gimpitemtreeview.obj \
gimplayertreeview.obj \
gimpmenufactory.obj \
gimpmenuitem.obj \
gimpnavigationpreview.obj \
gimppaletteeditor.obj \
gimppaletteselect.obj \
gimppatternfactoryview.obj \
gimppatternselect.obj \
gimppdbdialog.obj \
gimppluginaction.obj \
gimppreview.obj \
gimppreview-popup.obj \
gimppreviewrenderer.obj \
@ -97,8 +117,10 @@ OBJECTS = \
gimppreviewrenderervectors.obj \
gimppreviewrenderer-utils.obj \
gimppropwidgets.obj \
gimpselectiondata.obj \
gimpselectioneditor.obj \
gimpsessioninfo.obj \
gimpstringaction.obj \
gimpstrokeeditor.obj \
gimptemplateeditor.obj \
gimptemplateview.obj \
@ -107,10 +129,15 @@ OBJECTS = \
gimptoolbox.obj \
gimptoolbox-dnd.obj \
gimptoolbox-color-area.obj \
gimptoolbox-image-area.obj \
gimptoolbox-indicator-area.obj \
gimptooldialog.obj \
gimptooloptionseditor.obj \
gimptoolview.obj \
gimpuimanager.obj \
gimpunitcombobox.obj \
gimpundoeditor.obj \
gimpunitstore.obj \
gimpvectorstreeview.obj \
gimpviewablebutton.obj \
gimpviewabledialog.obj \

View File

@ -102,6 +102,7 @@ gimp_OBJECTS = \
gimppatternselect.obj \
gimppixelfetcher.obj \
gimppixelrgn.obj \
gimpplugin.obj \
gimpproceduraldb.obj \
gimpregioniterator.obj \
gimpselection.obj \
@ -124,11 +125,14 @@ gimp.obj : gimp.c
gimpui_OBJECTS = \
gimpui.obj \
gimpbrushmenu.obj \
gimpdrawablecombobox.obj \
gimpfontmenu.obj \
gimpfontselect_pdb.obj \
gimpgradientmenu.obj \
gimpmenu.obj \
gimpimagecombobox.obj \
gimppatternmenu.obj \
gimppixbuf.obj \
gimpexport.obj \
# gimppatheditor.obj \

View File

@ -230,7 +230,7 @@ gimp_filename_to_utf8 (const gchar *filename)
gchar *
gimp_memsize_to_string (guint64 memsize)
{
#if defined _MSC_VER && (_MSC_VER < 1200)
#if defined _MSC_VER && (_MSC_VER < 1300)
/* sorry, error C2520: conversion from unsigned __int64 to double not
* implemented, use signed __int64
*/

View File

@ -38,24 +38,12 @@ OBJECTS = \
gimputils.obj \
gimpwire.obj \
lib_LTLIBRARIES = \
libgimpbase-2.0.la
libgimpbase_2_0_la_LIBADD = \
$(GLIB_LIBS)
libgimpbaseincludedir = \
$(includedir)/gimp-$(LT_RELEASE)/libgimpbase
EXTRA_DIST = \
makefile.mingw \
makefile.mingw.in \
makefile.msc \
gimpbase.def
libgimpbase_2_0_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
libgimpbaseinclude_HEADERS = \
gimpbase.h \
gimpbasetypes.h \
@ -82,7 +70,7 @@ $(PACKAGE).lib : $(OBJECTS)
lib /out:$(PACKAGE).lib $(OBJECTS)
$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def
$(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def
$(CC) $(CFLAGS) -LD -Felib$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def
$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
$(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \

View File

@ -148,7 +148,7 @@ gimp_memsize_entry_unit_callback (GtkWidget *widget,
gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (widget), (gint *) &shift);
#if _MSC_VER < 1200
#if _MSC_VER < 1300
# define CAST (gint64)
#else
# define CAST
@ -188,7 +188,7 @@ gimp_memsize_entry_new (guint64 value,
GimpMemsizeEntry *entry;
guint shift;
#if _MSC_VER < 1200
#if _MSC_VER < 1300
# define CAST (gint64)
#else
# define CAST
@ -278,7 +278,7 @@ gimp_memsize_entry_set_value (GimpMemsizeEntry *entry,
gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (entry->menu), shift);
}
#if _MSC_VER < 1200
#if _MSC_VER < 1300
# define CAST (gint64)
#else
# define CAST

View File

@ -43,11 +43,16 @@ OBJECTS = \
gimpcolorselection.obj \
gimpcolordisplaystack.obj \
gimpcolorselector.obj \
gimpcontroller.obj \
gimpdialog.obj \
gimpfileentry.obj \
gimpframe.obj \
gimphelpui.obj \
gimpintcombobox.obj \
gimpintstore.obj \
gimpmemsizeentry.obj \
gimpoffsetarea.obj \
gimpoldwidgets.obj \
gimppatheditor.obj \
gimppickbutton.obj \
gimppixmap.obj \

View File

@ -18,6 +18,7 @@ SUBDIRS = \
# libgimptool \
libgimpmodule \
regexrepl \
cursors \
app \
# plug-ins \
modules

View File

@ -630,7 +630,7 @@ fprint (gfloat f,
{
gint i, t;
snprintf (buffer, len, "%.7f", f);
g_snprintf (buffer, len, "%.7f", f);
buffer[len - 1] = '\0';
for (t = 0; t < len - 1 && buffer[t] != '.'; t++);

View File

@ -438,7 +438,11 @@ select_window (GdkScreen *screen)
/* note to self: take a look at the winsnap plug-in for example
code */
#ifdef __GNUC__
#warning Win32 screenshot window chooser not implemented yet
#else
#pragma message "Win32 screenshot window chooser not implemented yet"
#endif
return 0;
#else /* GDK_WINDOWING_WIN32 */
#warning screenshot window chooser not implemented yet for this GDK backend

View File

@ -32,17 +32,17 @@ FROMPLUGINSDIR=YES # Used to bypass other parts below
# List plug-ins. We must use several lists to work around nmake's limits
# The COMMON* ones are in the common subdirectory
COMMON1 = AlienMap AlienMap2 ccanalyze CEL CML_explorer align_layers animationplay animoptimize apply_lens autocrop autostretch_hsv blinds blur borderaverage bumpmap c_astretch checkerboard color_enhance colorify colortoalpha compose convmatrix csource cubism curve_bend
COMMON2 = decompose deinterlace depthmerge despeckle destripe diffraction displace edge emboss engrave exchange film flarefx fractaltrace
COMMON3 = gauss_iir gauss_rle gbr gee gee_zoom gicon gif gifload gih glasstile gqbist gradmap grid gtm guillotine gz header hot hrz illusion iwarp jigsaw jpeg laplace lic
COMMON4 = mapcolor max_rgb mblur newsprint nlfilt noisify normalize nova oilify papertile pat pcx pix pixelize plasma plugindetails png pnm polar postscript psd psd_save psp randomize ripple rotate
COMMON5 = sample_colorize scatter_hsv semiflatten sharpen shift sinus smooth_palette snoise sobel sparkle spheredesigner spread struc sunras svg tga threshold_alpha tiff tile tileit tiler uniteditor unsharp video vinvert vpropagate
COMMON6 = warp waves whirlpinch winclipboard wind winprint wiredebug xbm xwd zealouscrop
COMMON1 = AlienMap2 ccanalyze CEL channel_mixer CML_explorer align_layers animationplay animoptimize apply_lens autocrop autostretch_hsv blinds blur borderaverage bumpmap c_astretch checkerboard color_enhance colorify colortoalpha compose convmatrix csource cubism curve_bend
COMMON2 = decompose deinterlace depthmerge despeckle destripe dicom diffraction displace edge emboss engrave exchange film flarefx fractaltrace
COMMON3 = gauss gbr gee gee_zoom gif gifload gih glasstile gqbist gradmap grid gtm guillotine gz header hot hrz illusion iwarp jigsaw jpeg laplace lic
COMMON4 = mapcolor max_rgb mblur mosaic newsprint nlfilt noisify normalize nova oilify papertile pat pcx pix pixelize plasma plugindetails png pnm polar postscript psd psd_save psp randomize ripple rotate
COMMON5 = sample_colorize scatter_hsv screenshot sel_gauss semiflatten sharpen shift sinus smooth_palette snoise sobel sparkle spheredesigner spread struc sunras svg tga threshold_alpha tiff tile tileit tiler uniteditor unsharp video vinvert vpropagate
COMMON6 = warp waves webbrowser whirlpinch winclipboard wind winprint wiredebug xbm xwd zealouscrop
NOTNOW = wmf
# These have own subdirectories each
SEPARATE = FractalExplorer Lighting MapObject bmp dbbrowser faxg3 fits flame fp gfig gflare gfli gimpressionist helpbrowser ifscompose imagemap maze mosaic pagecurl rcm sel2path sgi twain webbrowser winsnap xjt
SEPARATE = FractalExplorer Lighting MapObject bmp dbbrowser faxg3 fits flame fp gfig gflare gfli gimpressionist helpbrowser ifscompose imagemap maze mosaic pagecurl rcm sel2path sgi twain winicon winsnap xjt
# These are unofficial, ie not in the CVS. To build these, you should
# get tml's source snapshot and copy this makefile to the
@ -227,14 +227,6 @@ OBJECTS = \
rect.obj
!ENDIF
!IFDEF EXTRA_fp
OBJECTS = \
fp.obj \
fp_gdk.obj \
fp_gtk.obj \
fp_misc.obj
!ENDIF
!IFDEF EXTRA_gfli
OBJECTS = \
fli.obj \
@ -282,6 +274,7 @@ OBJECTS = \
gfig-arc.obj \
gfig-bezier.obj \
gfig-circle.obj \
gfig-dialog.obj \
gfig-dobject.obj \
gfig-ellipse.obj \
gfig-grid.obj \
@ -290,6 +283,7 @@ OBJECTS = \
gfig-preview.obj \
gfig-spiral.obj \
gfig-star.obj \
gfig-style.obj \
gfig-stock.obj
!ENDIF
@ -478,7 +472,7 @@ OBJECTS = \
gimpressionist.c: logo-pixbuf.h
logo-pixbuf.h: logo.png
gdk-pixbuf-csource --raw --name=logo_data logo.png > $(@F)
gdk-pixbuf-csource --rle --name=logo_data logo.png > $(@F)
OBJECTS = \
brush.obj \
@ -503,10 +497,10 @@ OBJECTS = \
!IFDEF EXTRA_helpbrowser
OBJECTS = \
helpbrowser.obj \
domain.obj \
dialog.obj \
browser-win32.obj \
queue.obj \
uri.obj
EXTRALIBS = user32.lib shell32.lib
!ENDIF
!IFDEF EXTRA_guash
@ -567,6 +561,14 @@ EXTRALIBS = user32.lib gdi32.lib comdlg32.lib
EXTRALIBS = user32.lib
!ENDIF
!IFDEF EXTRA_winicon
OBJECTS = \
icodialog.obj \
icoload.obj \
icosave.obj \
main.obj
!ENDIF
!IFDEF EXTRA_winsnap
HAVE_RESOURCE = YES
EXTRALIBS = user32.lib gdi32.lib

View File

@ -2,40 +2,7 @@
# !INCLUDE $(TOP)\glib\build\win32\make.msc
STOCK_VARIABLES = \
gimp_dialog_error gimp-dialog-error.png \
gimp_dialog_info gimp-dialog-info.png \
gimp_dialog_question gimp-dialog-question.png \
gimp_dialog_warning gimp-dialog-warning.png \
stock_all_16 stock-all-16.png \
stock_anchor_16 stock-anchor-16.png \
stock_button_anchor stock-button-anchor.png \
stock_button_delete stock-button-delete.png \
stock_button_duplicate stock-button-duplicate.png \
stock_button_edit stock-button-edit.png \
stock_button_eye stock-button-eye.png \
stock_button_hchain stock-button-hchain.png \
stock_button_hchain_broken stock-button-hchain-broken.png \
stock_button_linked stock-button-linked.png \
stock_button_lower stock-button-lower.png \
stock_button_new stock-button-new.png \
stock_button_paste stock-button-paste.png \
stock_button_paste_as_new stock-button-paste-as-new.png \
stock_button_paste_into stock-button-paste-into.png \
stock_button_path_stroke stock-button-path-stroke.png \
stock_button_raise stock-button-raise.png \
stock_button_refresh stock-button-refresh.png \
stock_button_reset stock-button-reset.png \
stock_button_selection_add stock-button-selection-add.png \
stock_button_selection_intersect stock-button-selection-intersect.png \
stock_button_selection_replace stock-button-selection-replace.png \
stock_button_selection_stroke stock-button-selection-stroke.png \
stock_button_selection_subtract stock-button-selection-subtract.png \
stock_button_selection_to_path stock-button-selection-to-path.png \
stock_button_stroke stock-button-stroke.png \
stock_button_to_path stock-button-to-path.png \
stock_button_to_selection stock-button-to-selection.png \
stock_button_vchain stock-button-vchain.png \
stock_button_vchain_broken stock-button-vchain-broken.png \
stock_cap_butt_16 stock-cap-butt-16.png \
stock_cap_round_16 stock-cap-round-16.png \
stock_cap_square_16 stock-cap-square-16.png \
@ -71,6 +38,7 @@ STOCK_VARIABLES = \
stock_channels_24 stock-channels-24.png \
stock_char_picker_22 stock-char-picker-22.png \
stock_close_12 stock-close-12.png \
stock_color_pick_from_screen_16 stock-color-pick-from-screen-16.png \
stock_color_picker_black_18 stock-color-picker-black-18.png \
stock_color_picker_gray_18 stock-color-picker-gray-18.png \
stock_color_picker_white_18 stock-color-picker-white-18.png \
@ -81,7 +49,6 @@ STOCK_VARIABLES = \
stock_curve_free_16 stock-curve-free-16.png \
stock_curve_smooth_16 stock-curve-smooth-16.png \
stock_default_colors_12 stock-default-colors-12.png \
stock_delete_16 stock-delete-16.png \
stock_device_status_16 stock-device-status-16.png \
stock_device_status_24 stock-device-status-24.png \
stock_display_filter_16 stock-display-filter-16.png \
@ -117,7 +84,6 @@ STOCK_VARIABLES = \
stock_gravity_south_west_24 stock-gravity-south-west-24.png \
stock_gravity_west_24 stock-gravity-west-24.png \
stock_grid_16 stock-grid-16.png \
stock_grow_16 stock-grow-16.png \
stock_histogram_16 stock-histogram-16.png \
stock_histogram_22 stock-histogram-22.png \
stock_histogram_linear_16 stock-histogram-linear-16.png \
@ -156,30 +122,12 @@ STOCK_VARIABLES = \
stock_linked_12 stock-linked-12.png \
stock_linked_20 stock-linked-20.png \
stock_list_16 stock-list-16.png \
stock_lower_16 stock-lower-16.png \
stock_menu_convert_grayscale stock-menu-convert-grayscale.png \
stock_menu_convert_indexed stock-menu-convert-indexed.png \
stock_menu_convert_rgb stock-menu-convert-rgb.png \
stock_menu_left_12 stock-menu-left-12.png \
stock_menu_merge_down stock-menu-merge-down.png \
stock_menu_navigation stock-menu-navigation.png \
stock_menu_qmask_off stock-menu-qmask-off.png \
stock_menu_qmask_on stock-menu-qmask-on.png \
stock_menu_reshow_filter stock-menu-reshow-filter.png \
stock_menu_resize stock-menu-resize.png \
stock_menu_right_12 stock-menu-right-12.png \
stock_menu_rotate_180 stock-menu-rotate-180.png \
stock_menu_rotate_270 stock-menu-rotate-270.png \
stock_menu_rotate_90 stock-menu-rotate-90.png \
stock_menu_scale stock-menu-scale.png \
stock_menu_selection_to_channel stock-menu-selection-to-channel.png \
stock_merge_down_16 stock-merge-down-16.png \
stock_move_to_screen_16 stock-move-to-screen-16.png \
stock_move_to_screen_24 stock-move-to-screen-24.png \
stock_navigation_16 stock-navigation-16.png \
stock_new_16 stock-new-16.png \
stock_none_16 stock-none-16.png \
stock_paste_16 stock-paste-16.png \
stock_paste_as_new_16 stock-paste-as-new-16.png \
stock_paste_into_16 stock-paste-into-16.png \
stock_path_16 stock-path-16.png \
@ -192,8 +140,6 @@ STOCK_VARIABLES = \
stock_qmask_off_16 stock-qmask-off-16.png \
stock_qmask_on_16 stock-qmask-on-16.png \
stock_question_64 stock-question-64.png \
stock_raise_16 stock-raise-16.png \
stock_refresh_16 stock-refresh-16.png \
stock_reset_16 stock-reset-16.png \
stock_reshow_filter_16 stock-reshow-filter-16.png \
stock_resize_16 stock-resize-16.png \
@ -214,7 +160,6 @@ STOCK_VARIABLES = \
stock_selection_subtract_16 stock-selection-subtract-16.png \
stock_selection_to_channel_16 stock-selection-to-channel-16.png \
stock_selection_to_path_16 stock-selection-to-path-16.png \
stock_shrink_16 stock-shrink-16.png \
stock_swap_colors_12 stock-swap-colors-12.png \
stock_template_16 stock-template-16.png \
stock_template_24 stock-template-24.png \
@ -248,13 +193,12 @@ STOCK_VARIABLES = \
stock_wilber_16 stock-wilber-16.png \
stock_wilber_64 stock-wilber-64.png \
stock_wilber_eek_64 stock-wilber-eek-64.png \
stock_wilber_eek stock-wilber-eek.png \
\
stock_zoom_follow_window_12 stock-zoom-follow-window-12.png
STOCK_TOOL_VARIABLES = \
stock_tool_airbrush_16 tools/stock-tool-airbrush-16.png \
stock_tool_airbrush_22 tools/stock-tool-airbrush-22.png \
stock_tool_bezier_select_16 tools/stock-tool-bezier-select-16.png \
stock_tool_bezier_select_22 tools/stock-tool-bezier-select-22.png \
stock_tool_blend_16 tools/stock-tool-blend-16.png \
stock_tool_blend_22 tools/stock-tool-blend-22.png \
stock_tool_blur_16 tools/stock-tool-blur-16.png \
@ -263,44 +207,6 @@ STOCK_TOOL_VARIABLES = \
stock_tool_brightness_contrast_22 tools/stock-tool-brightness-contrast-22.png \
stock_tool_bucket_fill_16 tools/stock-tool-bucket-fill-16.png \
stock_tool_bucket_fill_22 tools/stock-tool-bucket-fill-22.png \
stock_tool_button_airbrush tools/stock-tool-button-airbrush.png \
stock_tool_button_bezier_select tools/stock-tool-button-bezier-select.png \
stock_tool_button_blend tools/stock-tool-button-blend.png \
stock_tool_button_blur tools/stock-tool-button-blur.png \
stock_tool_button_brightness_contrast tools/stock-tool-button-brightness-contrast.png \
stock_tool_button_bucket_fill tools/stock-tool-button-bucket-fill.png \
stock_tool_button_by_color_select tools/stock-tool-button-by-color-select.png \
stock_tool_button_clone tools/stock-tool-button-clone.png \
stock_tool_button_color_balance tools/stock-tool-button-color-balance.png \
stock_tool_button_color_picker tools/stock-tool-button-color-picker.png \
stock_tool_button_crop tools/stock-tool-button-crop.png \
stock_tool_button_curves tools/stock-tool-button-curves.png \
stock_tool_button_dodge tools/stock-tool-button-dodge.png \
stock_tool_button_ellipse_select tools/stock-tool-button-ellipse-select.png \
stock_tool_button_eraser tools/stock-tool-button-eraser.png \
stock_tool_button_flip tools/stock-tool-button-flip.png \
stock_tool_button_free_select tools/stock-tool-button-free-select.png \
stock_tool_button_fuzzy_select tools/stock-tool-button-fuzzy-select.png \
stock_tool_button_histogram tools/stock-tool-button-histogram.png \
stock_tool_button_hue_saturation tools/stock-tool-button-hue-saturation.png \
stock_tool_button_ink tools/stock-tool-button-ink.png \
stock_tool_button_iscissors tools/stock-tool-button-iscissors.png \
stock_tool_button_levels tools/stock-tool-button-levels.png \
stock_tool_button_measure tools/stock-tool-button-measure.png \
stock_tool_button_move tools/stock-tool-button-move.png \
stock_tool_button_paintbrush tools/stock-tool-button-paintbrush.png \
stock_tool_button_path tools/stock-tool-button-path.png \
stock_tool_button_pencil tools/stock-tool-button-pencil.png \
stock_tool_button_perspective tools/stock-tool-button-perspective.png \
stock_tool_button_posterize tools/stock-tool-button-posterize.png \
stock_tool_button_rect_select tools/stock-tool-button-rect-select.png \
stock_tool_button_rotate tools/stock-tool-button-rotate.png \
stock_tool_button_scale tools/stock-tool-button-scale.png \
stock_tool_button_shear tools/stock-tool-button-shear.png \
stock_tool_button_smudge tools/stock-tool-button-smudge.png \
stock_tool_button_text tools/stock-tool-button-text.png \
stock_tool_button_threshold tools/stock-tool-button-threshold.png \
stock_tool_button_zoom tools/stock-tool-button-zoom.png \
stock_tool_by_color_select_16 tools/stock-tool-by-color-select-16.png \
stock_tool_by_color_select_22 tools/stock-tool-by-color-select-22.png \
stock_tool_clone_16 tools/stock-tool-clone-16.png \
@ -327,8 +233,6 @@ STOCK_TOOL_VARIABLES = \
stock_tool_free_select_22 tools/stock-tool-free-select-22.png \
stock_tool_fuzzy_select_16 tools/stock-tool-fuzzy-select-16.png \
stock_tool_fuzzy_select_22 tools/stock-tool-fuzzy-select-22.png \
stock_tool_histogram_16 tools/stock-tool-histogram-16.png \
stock_tool_histogram_22 tools/stock-tool-histogram-22.png \
stock_tool_hue_saturation_16 tools/stock-tool-hue-saturation-16.png \
stock_tool_hue_saturation_22 tools/stock-tool-hue-saturation-22.png \
stock_tool_ink_16 tools/stock-tool-ink-16.png \