mirror of https://github.com/GNOME/gimp.git
TILE_WIDTH is used unconditionally so always include "tile.h" WIN32 needs
2005-02-19 Hans Breuer <hans@breuer.org> * app/base/pixel-processor.c : TILE_WIDTH is used unconditionally so always include "tile.h" * app/base/tile-swap.c : WIN32 needs <process.h> for _getpid() * app/dialogs/user-install-dialog.c : include gimpwin32-io.h * libgimpbase/gimpwin32-io.h : there are no group or other flags in msvcrt, define S_IGRP etc in terms of _S_IREAD etc * plug-ins/script-fu/script-fu.c plug-ins/script-fu/siod-wrapper.c : no script-fu server on win32, make respective function calls conditional * libgimpconfig/makefile.msc : new file * **/makefile.msc app/gimpcore.def : updated, gimp builds and runs once more with ms toolchain
This commit is contained in:
Hans Breuer
Hans Breuer
parent
41eed1e8b9
commit
c6f63ea4e1
17
ChangeLog
17
ChangeLog
|
|
@ -1,3 +1,20 @@
|
|||
2005-02-19 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* app/base/pixel-processor.c : TILE_WIDTH is used unconditionally
|
||||
so always include "tile.h"
|
||||
* app/base/tile-swap.c : WIN32 needs <process.h> for _getpid()
|
||||
|
||||
* app/dialogs/user-install-dialog.c : include gimpwin32-io.h
|
||||
* libgimpbase/gimpwin32-io.h : there are no group or other
|
||||
flags in msvcrt, define S_IGRP etc in terms of _S_IREAD etc
|
||||
|
||||
* plug-ins/script-fu/script-fu.c plug-ins/script-fu/siod-wrapper.c :
|
||||
no script-fu server on win32, make respective function calls conditional
|
||||
|
||||
* libgimpconfig/makefile.msc : new file
|
||||
* **/makefile.msc app/gimpcore.def : updated, gimp builds
|
||||
and runs once more with ms toolchain
|
||||
|
||||
2005-02-18 Sven Neumann <sven@gimp.org>
|
||||
|
||||
* plug-ins/common/mng.c (mng_save_image): write a DEFI chunk to
|
||||
|
|
|
|||
|
|
@ -39,6 +39,8 @@ OBJECTS = \
|
|||
debug-commands.obj \
|
||||
dialogs-actions.obj \
|
||||
dialogs-commands.obj \
|
||||
dock-actions.obj \
|
||||
dock-commands.obj \
|
||||
dockable-actions.obj \
|
||||
dockable-commands.obj \
|
||||
documents-actions.obj \
|
||||
|
|
@ -88,6 +90,7 @@ OBJECTS = \
|
|||
vectors-commands.obj \
|
||||
view-actions.obj \
|
||||
view-commands.obj \
|
||||
window-actions.obj \
|
||||
|
||||
|
||||
$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
|
||||
|
|
|
|||
|
|
@ -33,10 +33,7 @@
|
|||
#include "pixel-processor.h"
|
||||
#include "pixel-region.h"
|
||||
|
||||
#ifdef ENABLE_MP
|
||||
#include "tile.h"
|
||||
#endif
|
||||
|
||||
|
||||
#define TILES_PER_THREAD 8
|
||||
#define PROGRESS_TIMEOUT 64
|
||||
|
|
|
|||
|
|
@ -34,6 +34,8 @@
|
|||
|
||||
#ifdef G_OS_WIN32
|
||||
#include "libgimpbase/gimpwin32-io.h"
|
||||
#include <process.h>
|
||||
#define getpid _getpid
|
||||
#endif
|
||||
|
||||
#include "base-types.h"
|
||||
|
|
|
|||
|
|
@ -22,22 +22,17 @@ PKG_LINK = \
|
|||
|
||||
OBJECTS = \
|
||||
gimpbaseconfig.obj \
|
||||
gimpconfig.obj \
|
||||
gimpconfig-deserialize.obj \
|
||||
gimpconfig-dump.obj \
|
||||
gimpconfig-error.obj \
|
||||
gimpconfig-params.obj \
|
||||
gimpconfig-path.obj \
|
||||
gimpconfig-serialize.obj \
|
||||
gimpconfig-types.obj \
|
||||
gimpconfig-file.obj \
|
||||
gimpconfig-utils.obj \
|
||||
gimpconfigwriter.obj \
|
||||
gimpcoreconfig.obj \
|
||||
gimpdisplayconfig.obj \
|
||||
gimpguiconfig.obj \
|
||||
gimppluginconfig.obj \
|
||||
gimprc-deserialize.obj \
|
||||
gimprc-serialize.obj \
|
||||
gimprc-unknown.obj \
|
||||
gimprc.obj \
|
||||
gimpscanner.obj \
|
||||
gimpxmlparser.obj \
|
||||
\
|
||||
!IFDEF DLLGIMP
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@ OBJECTS = \
|
|||
gimpdrawable-blend.obj \
|
||||
gimpdrawable-bucket-fill.obj \
|
||||
gimpdrawable-combine.obj \
|
||||
gimpdrawable-convert.obj \
|
||||
gimpdrawable-desaturate.obj \
|
||||
gimpdrawable-equalize.obj \
|
||||
gimpdrawable-histogram.obj \
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@
|
|||
|
||||
#ifdef G_OS_WIN32
|
||||
#include <direct.h> /* _mkdir() */
|
||||
#include <libgimpbase/gimpwin32-io.h>
|
||||
#endif
|
||||
|
||||
#include "libgimpbase/gimpbase.h"
|
||||
|
|
|
|||
|
|
@ -28,11 +28,12 @@ OBJECTS = \
|
|||
gimpdisplay.obj \
|
||||
gimpdisplay-foreach.obj \
|
||||
gimpdisplay-handlers.obj \
|
||||
# gimpdisplayoptions.obj \
|
||||
gimpdisplayshell.obj \
|
||||
gimpdisplayshell-appearance.obj \
|
||||
gimpdisplayshell-autoscroll.obj \
|
||||
gimpdisplayshell-callbacks.obj \
|
||||
gimpdisplayshell-close.obj \
|
||||
gimpdisplayshell-coords.obj \
|
||||
gimpdisplayshell-cursor.obj \
|
||||
gimpdisplayshell-dnd.obj \
|
||||
gimpdisplayshell-draw.obj \
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ EXPORTS
|
|||
file_open_with_display
|
||||
file_open_with_proc_and_display
|
||||
file_save
|
||||
file_save_as
|
||||
file_utils_filename_to_uri
|
||||
file_utils_uri_to_utf8_basename
|
||||
file_utils_uri_to_utf8_filename
|
||||
|
|
@ -105,31 +104,12 @@ EXPORTS
|
|||
gimp_channel_shrink
|
||||
gimp_channel_type_get_type
|
||||
gimp_channel_value
|
||||
gimp_check_glib_version
|
||||
gimp_clone_get_type
|
||||
gimp_clone_options_get_type
|
||||
gimp_config_connect
|
||||
gimp_config_deserialize_file
|
||||
gimp_config_diff
|
||||
gimp_config_dump
|
||||
gimp_config_duplicate
|
||||
gimp_config_file_backup_on_error
|
||||
gimp_config_file_copy
|
||||
gimp_config_interface_get_type
|
||||
gimp_config_is_equal_to
|
||||
gimp_config_path_expand
|
||||
gimp_config_reset
|
||||
gimp_config_serialize_to_file
|
||||
gimp_config_serialize_value
|
||||
gimp_config_sync
|
||||
gimp_config_writer_close
|
||||
gimp_config_writer_finish
|
||||
gimp_config_writer_linefeed
|
||||
gimp_config_writer_new_file
|
||||
gimp_config_writer_open
|
||||
gimp_config_writer_print
|
||||
gimp_config_writer_printf
|
||||
gimp_config_writer_string
|
||||
gimp_container_add
|
||||
gimp_container_add_handler
|
||||
gimp_container_foreach
|
||||
|
|
@ -475,7 +455,6 @@ EXPORTS
|
|||
gimp_load_config
|
||||
gimp_lut_free
|
||||
gimp_lut_new
|
||||
gimp_lut_process_2
|
||||
gimp_lut_setup
|
||||
gimp_marshal_BOOLEAN__ENUM_INT
|
||||
gimp_marshal_BOOLEAN__OBJECT_POINTER
|
||||
|
|
@ -520,7 +499,6 @@ EXPORTS
|
|||
gimp_palette_import_from_indexed_image
|
||||
gimp_palette_set_n_columns
|
||||
gimp_param_memsize_get_type
|
||||
gimp_param_path_get_type
|
||||
gimp_param_rgb_get_type
|
||||
gimp_param_spec_rgb
|
||||
gimp_param_spec_unit
|
||||
|
|
@ -552,11 +530,6 @@ EXPORTS
|
|||
gimp_scan_convert_free
|
||||
gimp_scan_convert_new
|
||||
gimp_scan_convert_render
|
||||
gimp_scanner_destroy
|
||||
gimp_scanner_new_file
|
||||
gimp_scanner_parse_color
|
||||
gimp_scanner_parse_int
|
||||
gimp_scanner_parse_string
|
||||
gimp_selection_float
|
||||
gimp_selection_get_type
|
||||
gimp_selection_save
|
||||
|
|
@ -750,3 +723,13 @@ gimp_view_size_get_type
|
|||
levels_stretch
|
||||
plug_in_proc_def_get_sensitive
|
||||
file_utils_find_proc_by_extension
|
||||
gimp_templates_migrate
|
||||
file_utils_filename_from_uri
|
||||
file_utils_find_proc
|
||||
gimp_drawable_get_sub_preview
|
||||
gimp_drawable_preview_bytes
|
||||
gimp_edit_copy_visible
|
||||
gimp_image_get_channel_index
|
||||
gimp_image_get_save_proc
|
||||
gimp_lut_process
|
||||
gimp_progress_pulse
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@ PKG_LINK = \
|
|||
\
|
||||
$(top_builddir)/libgimpbase/gimpbase-$(LT_RELEASE).lib \
|
||||
$(top_builddir)/libgimpcolor/gimpcolor-$(LT_RELEASE).lib \
|
||||
$(top_builddir)/libgimpconfig/gimpconfig-$(LT_RELEASE).lib \
|
||||
$(top_builddir)/libgimpmath/gimpmath-$(LT_RELEASE).lib \
|
||||
$(top_builddir)/libgimpthumb/gimpthumb-$(LT_RELEASE).lib \
|
||||
$(top_builddir)/libgimpmodule/gimpmodule-$(LT_RELEASE).lib \
|
||||
|
|
|
|||
|
|
@ -24,12 +24,14 @@ all : \
|
|||
!ENDIF
|
||||
|
||||
OBJECTS = \
|
||||
dockable-menu.obj \
|
||||
file-menu.obj \
|
||||
image-menu.obj \
|
||||
menus.obj \
|
||||
plug-in-menus.obj \
|
||||
toolbox-menu.obj \
|
||||
tool-options-menu.obj \
|
||||
window-menu.obj \
|
||||
|
||||
$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
|
||||
copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ LT_RELEASE = $(PKG_VER)
|
|||
|
||||
OBJECTS = \
|
||||
paint-funcs.obj \
|
||||
scale-funcs.obj \
|
||||
|
||||
mmx_sources = \
|
||||
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ OBJECTS = \
|
|||
gimperaseroptions.obj \
|
||||
gimpink.obj \
|
||||
gimpink-blob.obj \
|
||||
gimpink-undo.obj \
|
||||
gimpinkoptions.obj \
|
||||
gimppaintbrush.obj \
|
||||
gimppaintcore.obj \
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ PKG_LINK = \
|
|||
OBJECTS = \
|
||||
gimp-fonts.obj \
|
||||
gimpfont.obj \
|
||||
gimpfont-utils.obj \
|
||||
gimpfontlist.obj \
|
||||
gimptext.obj \
|
||||
gimptext-parasite.obj \
|
||||
|
|
@ -33,6 +34,7 @@ OBJECTS = \
|
|||
gimptext-compat.obj \
|
||||
gimptext-xlfd.obj \
|
||||
gimptextlayer.obj \
|
||||
gimptextlayer-transform.obj \
|
||||
gimptextlayer-xcf.obj \
|
||||
gimptextlayout.obj \
|
||||
gimptextlayout-render.obj \
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ PKG_LINK = \
|
|||
|
||||
OBJECTS = \
|
||||
gimpairbrushtool.obj \
|
||||
# gimpbezierselecttool.obj \
|
||||
gimpblendoptions.obj \
|
||||
gimpblendtool.obj \
|
||||
gimpbrightnesscontrasttool.obj \
|
||||
|
|
@ -68,6 +67,7 @@ OBJECTS = \
|
|||
gimpmeasuretool.obj \
|
||||
gimpmoveoptions.obj \
|
||||
gimpmovetool.obj \
|
||||
gimpnewrectselecttool.obj \
|
||||
gimppaintbrushtool.obj \
|
||||
gimppaintoptions-gui.obj \
|
||||
gimppainttool.obj \
|
||||
|
|
|
|||
|
|
@ -79,9 +79,6 @@ OBJECTS = \
|
|||
gimpdrawabletreeview.obj \
|
||||
gimpeditor.obj \
|
||||
gimpenumaction.obj \
|
||||
gimpenumcombobox.obj \
|
||||
gimpenumstore.obj \
|
||||
gimpenumwidgets.obj \
|
||||
gimperrorconsole.obj \
|
||||
gimperrordialog.obj \
|
||||
gimpfgbgeditor.obj \
|
||||
|
|
|
|||
|
|
@ -50,6 +50,19 @@ G_BEGIN_DECLS
|
|||
#define S_IXUSR _S_IEXEC
|
||||
#endif
|
||||
|
||||
#ifndef S_IRGRP
|
||||
#define S_IRGRP _S_IREAD
|
||||
#endif
|
||||
#ifndef S_IXGRP
|
||||
#define S_IXGRP _S_IEXEC
|
||||
#endif
|
||||
#ifndef S_IROTH
|
||||
#define S_IROTH _S_IREAD
|
||||
#endif
|
||||
#ifndef S_IXOTH
|
||||
#define S_IXOTH _S_IEXEC
|
||||
#endif
|
||||
|
||||
#ifndef _O_BINARY
|
||||
#define _O_BINARY 0
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -0,0 +1,50 @@
|
|||
## Makefile for building the GIMP DLLs and LIBs with Microsoft C.
|
||||
## Use: nmake -f makefile.msc
|
||||
|
||||
TOP = ..\..
|
||||
PRJ_TOP = ..
|
||||
!include $(TOP)\glib\build\win32\make.msc
|
||||
|
||||
!INCLUDE $(PRJ_TOP)\gimpdefs.msc
|
||||
PKG_VER = $(GIMP_VER)
|
||||
|
||||
################################################################
|
||||
|
||||
# Nothing much configurable below
|
||||
|
||||
INCLUDES = -I..
|
||||
# DEFINES = -DG_LOG_DOMAIN=\"LibGimpConfig\"
|
||||
DEPCFLAGS = \
|
||||
-FImsvc_recommended_pragmas.h \
|
||||
$(GLIB_CFLAGS)
|
||||
|
||||
DEPLIBS = $(GLIB_LIBS) $(INTL_LIBS) \
|
||||
..\libgimpbase\gimpbase-$(GIMP_VER).lib \
|
||||
..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \
|
||||
..\libgimpmath\gimpmath-$(GIMP_VER).lib \
|
||||
|
||||
all : \
|
||||
..\config.h \
|
||||
gimpconfig-$(GIMP_VER).dll
|
||||
|
||||
..\config.h : ..\config.h.win32
|
||||
copy ..\config.h.win32 ..\config.h
|
||||
|
||||
install : all
|
||||
$(INSTALL) gimpconfig-$(GIMP_VER).dll $(BIN)
|
||||
|
||||
OBJECTS = \
|
||||
gimpcolorconfig-enums.obj \
|
||||
gimpcolorconfig.obj \
|
||||
gimpconfig-deserialize.obj \
|
||||
gimpconfig-error.obj \
|
||||
gimpconfig-iface.obj \
|
||||
gimpconfig-path.obj \
|
||||
gimpconfig-serialize.obj \
|
||||
gimpconfig-utils.obj \
|
||||
gimpconfigwriter.obj \
|
||||
gimpscanner.obj \
|
||||
|
||||
gimpconfig-$(GIMP_VER).dll : $(OBJECTS) gimpconfig.def
|
||||
$(CC) $(CFLAGS) -LD -Fegimpconfig-$(GIMP_VER).dll $(OBJECTS) $(DEPLIBS) $(LDFLAGS) user32.lib /def:gimpconfig.def
|
||||
|
||||
|
|
@ -48,6 +48,9 @@ OBJECTS = \
|
|||
gimpcolorselector.obj \
|
||||
gimpcontroller.obj \
|
||||
gimpdialog.obj \
|
||||
gimpenumcombobox.obj \
|
||||
gimpenumstore.obj \
|
||||
gimpenumwidgets.obj \
|
||||
gimpfileentry.obj \
|
||||
gimpframe.obj \
|
||||
gimphelpui.obj \
|
||||
|
|
@ -61,6 +64,7 @@ OBJECTS = \
|
|||
gimppixmap.obj \
|
||||
gimppreviewarea.obj \
|
||||
gimppreview.obj \
|
||||
gimppropwidgets.obj \
|
||||
gimpscrolledpreview.obj \
|
||||
gimpquerybox.obj \
|
||||
gimpsizeentry.obj \
|
||||
|
|
@ -84,6 +88,7 @@ gimpunit.obj : ..\app\gimpunit.c
|
|||
gimpwidgets-$(GIMP_VER).dll : $(OBJECTS) gimpwidgets.def
|
||||
$(CC) $(CFLAGS) -LD -Fegimpwidgets-$(GIMP_VER).dll $(OBJECTS) \
|
||||
..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \
|
||||
..\libgimpconfig\gimpconfig-$(GIMP_VER).lib \
|
||||
..\libgimpbase\gimpbase-$(GIMP_VER).lib \
|
||||
$(DEPLIBS) $(LDFLAGS) user32.lib /def:gimpwidgets.def
|
||||
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ SUBDIRS = \
|
|||
libgimpbase \
|
||||
libgimpcolor \
|
||||
libgimpmath \
|
||||
libgimpconfig \
|
||||
libgimpthumb \
|
||||
libgimpwidgets \
|
||||
libgimp \
|
||||
|
|
|
|||
|
|
@ -282,6 +282,7 @@ STOCK_VARS = \
|
|||
stock_move_object images/stock-move-object.png \
|
||||
stock_move_point images/stock-move-point.png \
|
||||
stock_polygon images/stock-polygon.png \
|
||||
stock_rectangle images/stock-rectangle.png \
|
||||
stock_spiral images/stock-spiral.png \
|
||||
stock_star images/stock-star.png \
|
||||
stock_select_object images/stock-select-object.png \
|
||||
|
|
@ -320,6 +321,7 @@ OBJECTS = \
|
|||
gfig-line.obj \
|
||||
gfig-poly.obj \
|
||||
gfig-preview.obj \
|
||||
gfig-rectangle.obj \
|
||||
gfig-spiral.obj \
|
||||
gfig-star.obj \
|
||||
gfig-style.obj \
|
||||
|
|
@ -593,6 +595,8 @@ gimpressionist.c: logo-pixbuf.h
|
|||
logo-pixbuf.h: logo.png
|
||||
gdk-pixbuf-csource --rle --name=logo_data logo.png > $(@F)
|
||||
|
||||
EXTRALIBS = $(GTK2_LIBS)
|
||||
|
||||
OBJECTS = \
|
||||
brush.obj \
|
||||
color.obj \
|
||||
|
|
|
|||
|
|
@ -1209,9 +1209,11 @@ marshall_proc_db_call (LISP a)
|
|||
/* reverse the return values */
|
||||
return_val = nreverse (return_val);
|
||||
|
||||
#ifndef G_OS_WIN32
|
||||
/* if we're in server mode, listen for additional commands for 10 ms */
|
||||
if (script_fu_server_get_mode ())
|
||||
script_fu_server_listen (10);
|
||||
#endif
|
||||
|
||||
#ifdef GDK_WINDOWING_WIN32
|
||||
/* This seems to help a lot on Windoze. */
|
||||
|
|
@ -1243,7 +1245,9 @@ script_fu_menu_register_call (LISP a)
|
|||
static LISP
|
||||
script_fu_quit_call (LISP a)
|
||||
{
|
||||
#ifndef G_OS_WIN32
|
||||
script_fu_server_quit ();
|
||||
#endif
|
||||
|
||||
return NIL;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -249,9 +249,12 @@ script_fu_run (const gchar *name,
|
|||
/*
|
||||
* The script-fu server for remote operation
|
||||
*/
|
||||
|
||||
#ifndef G_OS_WIN32
|
||||
script_fu_server_run (name, nparams, param,
|
||||
nreturn_vals, return_vals);
|
||||
#else
|
||||
g_warning ("No script-fu server on win32");
|
||||
#endif
|
||||
}
|
||||
else if (strcmp (name, "plug_in_script_fu_eval") == 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1209,9 +1209,11 @@ marshall_proc_db_call (LISP a)
|
|||
/* reverse the return values */
|
||||
return_val = nreverse (return_val);
|
||||
|
||||
#ifndef G_OS_WIN32
|
||||
/* if we're in server mode, listen for additional commands for 10 ms */
|
||||
if (script_fu_server_get_mode ())
|
||||
script_fu_server_listen (10);
|
||||
#endif
|
||||
|
||||
#ifdef GDK_WINDOWING_WIN32
|
||||
/* This seems to help a lot on Windoze. */
|
||||
|
|
@ -1243,7 +1245,9 @@ script_fu_menu_register_call (LISP a)
|
|||
static LISP
|
||||
script_fu_quit_call (LISP a)
|
||||
{
|
||||
#ifndef G_OS_WIN32
|
||||
script_fu_server_quit ();
|
||||
#endif
|
||||
|
||||
return NIL;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue