Commit b56eb39e authored by Hans Breuer's avatar Hans Breuer Committed by Hans Breuer
Browse files

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 ...
parent 5d0d0c2e
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
......
......@@ -141,7 +141,8 @@ libappactions_a_SOURCES = \
view-commands.h
EXTRA_DIST =
EXTRA_DIST = \
makefile.msc
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Actions\" \
......
......@@ -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
......
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) $<
......@@ -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"
......
......@@ -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 \
......
......@@ -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 \
......
......@@ -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 = \
......
......@@ -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 = \
......
......@@ -25,7 +25,8 @@ libappmenus_a_SOURCES = \
toolbox-menu.h
EXTRA_DIST =
EXTRA_DIST = \
makefile.msc
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Menus\" \
......
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) $<
......@@ -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 \
......
......@@ -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 : \
......
......@@ -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 \
......
......@@ -27,7 +27,6 @@ INCLUDES = \
OBJECTS = \
gimpanchor.obj \
gimpcoordmath.obj \
gimpstroke.obj \
gimpvectors-export.obj \
gimpvectors-import.obj \
......
......@@ -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 \
......
......@@ -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 \
......
......@@ -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
*/
......
......@@ -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 \
</