mirror of https://github.com/GNOME/gimp.git
updated
2005-09-24 Hans Breuer <hans@breuer.org> * **makefile.msc : updated * app/dialogs/user-install-dialog.c : only add the migrate page if there is something to migrate from. Avoids on version being NULL. * app/dialogs/file-save-dialog.c : the g_print() output was crashing on the assumption that ->menu_label != NULL. It is for colorhtml.py. * app/widgets/gimpselectiondata.c : use HAVE_UNISTD_H and move * process.h definition by G_OS_WIN32 below it being defined * app/widgets/gimpwidgets-utils.c(gimp_window_get_native) : cast return value to (GdkNativeWindow) it is not necessary an int. * libgimpwidgets/gimpwidgets.def : added gimp_zoom_type_get_type * plug-ins/help/gimp-help-lookup.c : dynamic lookup of help_root instead of hard-coding DATADIR/GIMP_HELP_PREFIX * plug-ins/xjt/xjt.c : there is no pid_t with msvc, typedef one.
This commit is contained in:
Hans Breuer
Hans Breuer
parent
1abb01394c
commit
0b515bec9b
22
ChangeLog
22
ChangeLog
|
|
@ -1,3 +1,25 @@
|
|||
2005-09-24 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* **makefile.msc : updated
|
||||
|
||||
* app/dialogs/user-install-dialog.c : only add the migrate page if
|
||||
there is something to migrate from. Avoids on version being NULL.
|
||||
|
||||
* app/dialogs/file-save-dialog.c : the g_print() output was crashing
|
||||
on the assumption that ->menu_label != NULL. It is for colorhtml.py.
|
||||
|
||||
* app/widgets/gimpselectiondata.c : use HAVE_UNISTD_H and move
|
||||
* process.h definition by G_OS_WIN32 below it being defined
|
||||
* app/widgets/gimpwidgets-utils.c(gimp_window_get_native) : cast
|
||||
return value to (GdkNativeWindow) it is not necessary an int.
|
||||
|
||||
* libgimpwidgets/gimpwidgets.def : added gimp_zoom_type_get_type
|
||||
|
||||
* plug-ins/help/gimp-help-lookup.c : dynamic lookup of help_root
|
||||
instead of hard-coding DATADIR/GIMP_HELP_PREFIX
|
||||
|
||||
* plug-ins/xjt/xjt.c : there is no pid_t with msvc, typedef one.
|
||||
|
||||
2005-09-25 Michael Natterer <mitch@gimp.org>
|
||||
|
||||
* app/actions/plug-in-actions.c
|
||||
|
|
|
|||
|
|
@ -76,8 +76,8 @@ OBJECTS = \
|
|||
patterns-actions.obj \
|
||||
plug-in-actions.obj \
|
||||
plug-in-commands.obj \
|
||||
qmask-actions.obj \
|
||||
qmask-commands.obj \
|
||||
quick-mask-actions.obj \
|
||||
quick-mask-commands.obj \
|
||||
sample-point-editor-actions.obj \
|
||||
sample-point-editor-commands.obj \
|
||||
select-actions.obj \
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ OBJECTS = \
|
|||
brush-scale.obj \
|
||||
color-balance.obj \
|
||||
colorize.obj \
|
||||
cpercep.obj \
|
||||
curves.obj \
|
||||
gimphistogram.obj \
|
||||
gimplut.obj \
|
||||
|
|
@ -32,7 +33,7 @@ OBJECTS = \
|
|||
pixel-processor.obj \
|
||||
pixel-region.obj \
|
||||
pixel-surround.obj \
|
||||
segmentator.obj \
|
||||
siox.obj \
|
||||
temp-buf.obj \
|
||||
threshold.obj \
|
||||
tile.obj \
|
||||
|
|
|
|||
|
|
@ -33,8 +33,8 @@ PKG_LINK = \
|
|||
OBJECTS = \
|
||||
# ..\undo.obj \
|
||||
core-enums.obj \
|
||||
cpercep.obj \
|
||||
gimp.obj \
|
||||
gimp-contexts.obj \
|
||||
gimp-edit.obj \
|
||||
gimp-gui.obj \
|
||||
gimp-units.obj \
|
||||
|
|
@ -92,7 +92,7 @@ OBJECTS = \
|
|||
gimpimage-new.obj \
|
||||
gimpimage-pick-color.obj \
|
||||
gimpimage-preview.obj \
|
||||
gimpimage-qmask.obj \
|
||||
gimpimage-quick-mask.obj \
|
||||
gimpimage-resize.obj \
|
||||
gimpimage-rotate.obj \
|
||||
gimpimage-sample-points.obj \
|
||||
|
|
|
|||
|
|
@ -185,11 +185,11 @@ file_save_dialog_check_uri (GtkWidget *save_dialog,
|
|||
g_print ("%s: basename = %s\n",
|
||||
G_STRFUNC, basename);
|
||||
g_print ("%s: selected save_proc: %s\n",
|
||||
G_STRFUNC, save_proc ? save_proc->menu_label : "NULL");
|
||||
G_STRFUNC, save_proc && save_proc->menu_label ? save_proc->menu_label : "NULL");
|
||||
g_print ("%s: URI save_proc: %s\n",
|
||||
G_STRFUNC, uri_proc ? uri_proc->menu_label : "NULL");
|
||||
g_print ("%s: basename save_proc: %s\n\n",
|
||||
G_STRFUNC, basename_proc ? basename_proc->menu_label : "NULL");
|
||||
G_STRFUNC, basename_proc && basename_proc->menu_label ? basename_proc->menu_label : "NULL");
|
||||
|
||||
|
||||
/* first check if the user entered an extension at all */
|
||||
|
|
@ -302,7 +302,7 @@ file_save_dialog_check_uri (GtkWidget *save_dialog,
|
|||
}
|
||||
|
||||
g_print ("%s: use URI's proc '%s' so indirect saving works\n",
|
||||
G_STRFUNC, uri_proc->menu_label);
|
||||
G_STRFUNC, uri_proc->menu_label ? uri_proc->menu_label : "?");
|
||||
|
||||
/* use the URI's proc if no save proc was selected */
|
||||
save_proc = uri_proc;
|
||||
|
|
|
|||
|
|
@ -812,6 +812,7 @@ user_install_dialog_run (const gchar *alternate_system_gimprc,
|
|||
"MA 02111-1307, USA."));
|
||||
|
||||
/* MIGRATION_PAGE */
|
||||
if (version && migrate)
|
||||
{
|
||||
GtkWidget *box;
|
||||
gchar *title;
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@ EXPORTS
|
|||
file_utils_filename_to_uri
|
||||
file_utils_uri_to_utf8_basename
|
||||
file_utils_uri_to_utf8_filename
|
||||
find_mask_boundary
|
||||
floating_sel_anchor
|
||||
floating_sel_remove
|
||||
floating_sel_to_layer
|
||||
|
|
@ -103,7 +102,7 @@ EXPORTS
|
|||
gimp_channel_sharpen
|
||||
gimp_channel_shrink
|
||||
gimp_channel_type_get_type
|
||||
gimp_channel_value
|
||||
; gimp_channel_value
|
||||
gimp_clone_get_type
|
||||
gimp_clone_options_get_type
|
||||
gimp_config_connect
|
||||
|
|
@ -308,8 +307,8 @@ EXPORTS
|
|||
gimp_image_get_layer_index
|
||||
gimp_image_get_layers
|
||||
gimp_image_get_mask
|
||||
gimp_image_get_qmask_color
|
||||
gimp_image_get_qmask_state
|
||||
gimp_image_get_quick_mask_color
|
||||
gimp_image_get_quick_mask_state
|
||||
gimp_image_get_type
|
||||
gimp_image_get_uri
|
||||
gimp_image_get_vectors
|
||||
|
|
@ -340,7 +339,7 @@ EXPORTS
|
|||
gimp_image_position_channel
|
||||
gimp_image_position_layer
|
||||
gimp_image_position_vectors
|
||||
gimp_image_qmask_invert
|
||||
gimp_image_quick_mask_invert
|
||||
gimp_image_raise_channel
|
||||
gimp_image_raise_channel_to_top
|
||||
gimp_image_raise_layer
|
||||
|
|
@ -365,8 +364,8 @@ EXPORTS
|
|||
gimp_image_set_component_active
|
||||
gimp_image_set_component_visible
|
||||
gimp_image_set_grid
|
||||
gimp_image_set_qmask_color
|
||||
gimp_image_set_qmask_state
|
||||
gimp_image_set_quick_mask_color
|
||||
gimp_image_set_quick_mask_state
|
||||
gimp_image_set_resolution
|
||||
gimp_image_set_unit
|
||||
gimp_image_snap_point
|
||||
|
|
@ -431,7 +430,7 @@ EXPORTS
|
|||
gimp_layer_get_mask
|
||||
gimp_layer_get_mode
|
||||
gimp_layer_get_opacity
|
||||
gimp_layer_get_preserve_trans
|
||||
; gimp_layer_get_preserve_trans
|
||||
gimp_layer_get_type
|
||||
gimp_layer_is_floating_sel
|
||||
gimp_layer_mask_get_apply
|
||||
|
|
@ -447,7 +446,7 @@ EXPORTS
|
|||
gimp_layer_resize_to_image
|
||||
gimp_layer_set_mode
|
||||
gimp_layer_set_opacity
|
||||
gimp_layer_set_preserve_trans
|
||||
; gimp_layer_set_preserve_trans
|
||||
gimp_list_get_type
|
||||
gimp_list_new
|
||||
gimp_list_new_weak
|
||||
|
|
@ -469,6 +468,8 @@ EXPORTS
|
|||
gimp_marshal_VOID__OBJECT_OBJECT
|
||||
gimp_marshal_VOID__OBJECT_POINTER
|
||||
gimp_marshal_VOID__POINTER
|
||||
gimp_marshal_VOID__POINTER_BOXED
|
||||
gimp_marshal_VOID__POINTER_ENUM
|
||||
gimp_marshal_VOID__STRING
|
||||
gimp_marshal_VOID__STRING_BOOLEAN_UINT_FLAGS
|
||||
gimp_marshal_VOID__STRING_FLAGS
|
||||
|
|
@ -683,7 +684,7 @@ EXPORTS
|
|||
gimp_histogram_scale_get_type
|
||||
gimp_tab_style_get_type
|
||||
gimp_view_type_get_type
|
||||
gimp_zoom_type_get_type
|
||||
; gimp_zoom_type_get_type
|
||||
; gimpdisplayoptions.obj
|
||||
gimp_display_options_fullscreen_get_type
|
||||
gimp_display_options_get_type
|
||||
|
|
@ -699,11 +700,6 @@ gimp_image_parasite_find
|
|||
gimp_image_resize_to_layers
|
||||
gimp_imagefile_create_thumbnail_weak
|
||||
gimp_marshal_VOID__BOXED_ENUM
|
||||
gimp_navigation_editor_get_type
|
||||
gimp_navigation_editor_new
|
||||
gimp_navigation_editor_popup
|
||||
gimp_progress_box_get_type
|
||||
gimp_progress_box_new
|
||||
gimp_progress_cancel
|
||||
gimp_progress_end
|
||||
gimp_progress_get_value
|
||||
|
|
@ -713,11 +709,6 @@ gimp_progress_set_text
|
|||
gimp_progress_set_value
|
||||
gimp_progress_start
|
||||
gimp_stroke_desc_new
|
||||
gimp_tool_motion_constrain
|
||||
gimp_view_renderer_image_get_type
|
||||
gimp_view_renderer_imagefile_get_type
|
||||
gimp_view_renderer_layer_get_type
|
||||
gimp_view_renderer_vectors_get_type
|
||||
gimp_view_size_get_type
|
||||
levels_stretch
|
||||
plug_in_proc_def_get_sensitive
|
||||
|
|
@ -759,5 +750,24 @@ gimp_dash_pattern_segments_set
|
|||
gimp_dash_pattern_from_segments
|
||||
gimp_item_align
|
||||
gimp_stroke_options_set_dash_pattern
|
||||
sort_boundary
|
||||
|
||||
boundary_find
|
||||
boundary_sort
|
||||
gimp_contexts_clear
|
||||
gimp_contexts_load
|
||||
gimp_contexts_save
|
||||
gimp_edit_named_copy
|
||||
gimp_edit_named_copy_visible
|
||||
gimp_edit_named_cut
|
||||
gimp_get_default_unit
|
||||
gimp_layer_flatten
|
||||
gimp_layer_get_lock_alpha
|
||||
gimp_layer_set_lock_alpha
|
||||
gimp_pickable_get_opacity_at
|
||||
gimp_undo_stack_get_depth
|
||||
pixel_region_init_data
|
||||
pixel_region_init_temp_buf
|
||||
gimp_drawable_foreground_extract_siox
|
||||
gimp_scan_convert_add_polyline
|
||||
gimp_scan_convert_compose
|
||||
gimp_scan_convert_render_value
|
||||
gimp_scan_convert_stroke
|
||||
|
|
@ -49,13 +49,6 @@ GIMP_CORE_OBJECTS = \
|
|||
xcf/xcf.lib \
|
||||
|
||||
PKG_LINK = \
|
||||
actions/appactions.lib \
|
||||
menus/appmenus.lib \
|
||||
tools/apptools.lib \
|
||||
gui/appgui.lib \
|
||||
dialogs/appdialogs.lib \
|
||||
widgets/appwidgets.lib \
|
||||
display/appdisplay.lib \
|
||||
$(PRJ_TOP)/regexrepl/regexrepl.lib \
|
||||
\
|
||||
$(top_builddir)/libgimpbase/gimpbase-$(LT_RELEASE).lib \
|
||||
|
|
@ -99,6 +92,14 @@ OBJECTS = \
|
|||
errors.obj \
|
||||
sanity.obj \
|
||||
units.obj \
|
||||
\
|
||||
actions/appactions.lib \
|
||||
menus/appmenus.lib \
|
||||
tools/apptools.lib \
|
||||
gui/appgui.lib \
|
||||
dialogs/appdialogs.lib \
|
||||
widgets/appwidgets.lib \
|
||||
display/appdisplay.lib \
|
||||
|
||||
app_procs_console.obj : app_procs.c
|
||||
$(CC) $(CFLAGS) -DGIMP_CONSOLE_COMPILATION -GD -c $(PKG_CFLAGS) -Foapp_procs_console.obj app_procs.c
|
||||
|
|
|
|||
|
|
@ -53,6 +53,8 @@ OBJECTS = \
|
|||
gimperasertool.obj \
|
||||
gimpflipoptions.obj \
|
||||
gimpfliptool.obj \
|
||||
gimpforegroundselectoptions.obj \
|
||||
gimpforegroundselecttool.obj \
|
||||
gimpfreeselecttool.obj \
|
||||
gimpfuzzyselecttool.obj \
|
||||
gimphistogramoptions.obj \
|
||||
|
|
@ -69,6 +71,7 @@ OBJECTS = \
|
|||
gimpmeasuretool.obj \
|
||||
gimpmoveoptions.obj \
|
||||
gimpmovetool.obj \
|
||||
gimpnewrectselectoptions.obj \
|
||||
gimpnewrectselecttool.obj \
|
||||
gimppaintbrushtool.obj \
|
||||
gimppaintoptions-gui.obj \
|
||||
|
|
|
|||
|
|
@ -22,14 +22,16 @@
|
|||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
#ifdef HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
#include <process.h> /* getpid() */
|
||||
#endif
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
#include <process.h> /* getpid() : defined from _getpid by GLib */
|
||||
#endif
|
||||
|
||||
#include "libgimpcolor/gimpcolor.h"
|
||||
|
||||
#include "widgets-types.h"
|
||||
|
|
|
|||
|
|
@ -730,7 +730,7 @@ gimp_window_get_native (GtkWindow *window)
|
|||
|
||||
#ifdef GDK_WINDOWING_WIN32
|
||||
if (window && GTK_WIDGET_REALIZED (window))
|
||||
return GDK_WINDOW_HWND (GTK_WIDGET (window)->window);
|
||||
return (GdkNativeWindow)GDK_WINDOW_HWND (GTK_WIDGET (window)->window);
|
||||
#endif
|
||||
|
||||
#ifdef GDK_WINDOWING_X11
|
||||
|
|
@ -738,7 +738,7 @@ gimp_window_get_native (GtkWindow *window)
|
|||
return GDK_WINDOW_XID (GTK_WIDGET (window)->window);
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
return (GdkNativeWindow)0;
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
|||
|
|
@ -79,6 +79,7 @@ OBJECTS = \
|
|||
gimpdockable.obj \
|
||||
gimpdockbook.obj \
|
||||
gimpdocked.obj \
|
||||
gimpdockseparator.obj \
|
||||
gimpdocumentview.obj \
|
||||
gimpdrawabletreeview.obj \
|
||||
gimpeditor.obj \
|
||||
|
|
@ -111,6 +112,7 @@ OBJECTS = \
|
|||
gimpnavigationview.obj \
|
||||
gimppaletteeditor.obj \
|
||||
gimppaletteselect.obj \
|
||||
gimppaletteview.obj \
|
||||
gimppatternfactoryview.obj \
|
||||
gimppatternselect.obj \
|
||||
gimppdbdialog.obj \
|
||||
|
|
@ -119,6 +121,7 @@ OBJECTS = \
|
|||
gimpprogressbox.obj \
|
||||
gimpprogressdialog.obj \
|
||||
gimppropwidgets.obj \
|
||||
gimprender.obj \
|
||||
gimpsamplepointeditor.obj \
|
||||
gimpselectiondata.obj \
|
||||
gimpselectioneditor.obj \
|
||||
|
|
@ -155,6 +158,7 @@ OBJECTS = \
|
|||
gimpviewrendererbuffer.obj \
|
||||
gimpviewrendererdrawable.obj \
|
||||
gimpviewrenderergradient.obj \
|
||||
gimpviewrendererpalette.obj \
|
||||
gimpviewrendererimage.obj \
|
||||
gimpviewrendererimagefile.obj \
|
||||
gimpviewrendererlayer.obj \
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ CURSOR_LIST = \
|
|||
modifier_control modifier-control.png \
|
||||
modifier_foreground modifier-foreground.png \
|
||||
modifier_intersect modifier-intersect.png \
|
||||
modifier_join modifier-join.png \
|
||||
modifier_minus modifier-minus.png \
|
||||
modifier_move modifier-move.png \
|
||||
modifier_pattern modifier-pattern.png \
|
||||
|
|
@ -40,6 +41,9 @@ CURSOR_LIST = \
|
|||
tool_move tool-move.png \
|
||||
tool_paintbrush tool-paintbrush.png \
|
||||
tool_paths tool-paths.png \
|
||||
tool_paths_anchor tool-paths-anchor.png \
|
||||
tool_paths_control tool-paths-control.png \
|
||||
tool_paths_segment tool-paths-segment.png \
|
||||
tool_pencil tool-pencil.png \
|
||||
tool_perspective tool-perspective.png \
|
||||
tool_rect_select tool-rect-select.png \
|
||||
|
|
|
|||
|
|
@ -157,9 +157,12 @@ gimpui_OBJECTS = \
|
|||
gimppalettemenu.obj \
|
||||
gimppatternmenu.obj \
|
||||
gimppixbuf.obj \
|
||||
gimpprocbrowserdialog.obj \
|
||||
gimpprocview.obj \
|
||||
gimpprogressbar.obj \
|
||||
gimpui.obj \
|
||||
gimpuimarshal.obj \
|
||||
gimpzoompreview.obj \
|
||||
|
||||
gimpuimarshal.h : gimpuimarshal.list
|
||||
$(GLIB)\gobject\glib-genmarshal --prefix=_gimpui_marshal gimpuimarshal.list --header >gimpuimarshal.h
|
||||
|
|
|
|||
|
|
@ -336,3 +336,5 @@ EXPORTS
|
|||
gimp_zoom_model_zoom
|
||||
gimp_zoom_model_zoom_step
|
||||
gimp_zoom_widget_new
|
||||
gimp_zoom_type_get_type
|
||||
|
||||
|
|
|
|||
|
|
@ -70,10 +70,12 @@ OBJECTS = \
|
|||
gimppropwidgets.obj \
|
||||
gimpscrolledpreview.obj \
|
||||
gimpquerybox.obj \
|
||||
gimpresolutionentry.obj \
|
||||
gimpsizeentry.obj \
|
||||
gimpstock.obj \
|
||||
gimpunitmenu.obj \
|
||||
gimpwidgets.obj \
|
||||
gimpzoommodel.obj \
|
||||
gimpwidgets-private.obj \
|
||||
gimpwidgetsenums.obj \
|
||||
gimpwidgetsmarshal.obj \
|
||||
|
|
|
|||
|
|
@ -38,6 +38,9 @@ sub-clean:
|
|||
for %d in ($(SUBDIRS)) do nmake -nologo -f makefile.msc sub-one THIS=%d TARGET=clean
|
||||
|
||||
sub-themes:
|
||||
cd cursors
|
||||
nmake -nologo -f makefile.msc
|
||||
cd ..
|
||||
cd themes\Default\images
|
||||
nmake -nologo -f makefile.msc
|
||||
cd ..\..\..
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
#include <glib.h>
|
||||
|
||||
#include "libgimpbase/gimpversion.h"
|
||||
#include "libgimpbase/gimpenv.h"
|
||||
|
||||
#include "domain.h"
|
||||
#include "help.h"
|
||||
|
|
@ -41,7 +42,7 @@ static gchar * lookup (const gchar *help_domain,
|
|||
|
||||
|
||||
static const gchar *help_base = NULL;
|
||||
static const gchar *help_root = NULL;
|
||||
static gchar *help_root = NULL;
|
||||
static const gchar *help_locales = NULL;
|
||||
static const gchar **help_ids = NULL;
|
||||
|
||||
|
|
@ -82,7 +83,7 @@ main (gint argc,
|
|||
GError *error = NULL;
|
||||
|
||||
help_base = g_getenv (GIMP_HELP_ENV_URI);
|
||||
help_root = DATADIR G_DIR_SEPARATOR_S GIMP_HELP_PREFIX;
|
||||
help_root = g_build_path (G_DIR_SEPARATOR_S, gimp_data_directory (), GIMP_HELP_PREFIX, NULL);
|
||||
|
||||
context = g_option_context_new ("HELP-ID");
|
||||
g_option_context_add_main_entries (context, entries, NULL);
|
||||
|
|
@ -112,6 +113,7 @@ main (gint argc,
|
|||
}
|
||||
|
||||
g_option_context_free (context);
|
||||
g_free (help_root);
|
||||
|
||||
return uri ? EXIT_SUCCESS : EXIT_FAILURE;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ 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
|
||||
COMMON0 = plugin_browser procedure_browser gnomeprint
|
||||
COMMON1 = AlienMap2 ccanalyze CEL channel_mixer CML_explorer align_layers animationplay animoptimize apply_lens autocrop autostretch_hsv blinds blur borderaverage bumpmap c_astretch cartoon checkerboard color_enhance colorify colortoalpha compose compressor convmatrix csource cubism curve_bend
|
||||
COMMON2 = decompose deinterlace depthmerge despeckle destripe dicom diffraction displace dog edge emboss engrave exchange film flarefx fp fractaltrace
|
||||
COMMON3 = gauss gbr gee gee_zoom gif gifload gih glasstile glob gqbist gradmap grid gtm guillotine header hot illusion iwarp jigsaw laplace lic
|
||||
|
|
@ -42,7 +43,7 @@ COMMON6 = warp waves webbrowser whirlpinch winclipboard wind winprint wiredebug
|
|||
NOTNOW = wmf svg
|
||||
|
||||
# These have own subdirectories each
|
||||
SEPARATE = FractalExplorer Lighting MapObject bmp dbbrowser faxg3 fits flame fp gfig gflare gfli gimpressionist helpbrowser ifscompose imagemap jpeg maze mosaic pagecurl rcm sel2path sgi twain winicon winsnap xjt
|
||||
SEPARATE = FractalExplorer Lighting MapObject bmp faxg3 fits flame gfig gflare gfli gimpressionist help helpbrowser ifscompose imagemap jpeg maze metadata 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
|
||||
|
|
@ -92,6 +93,7 @@ common-plugins-clean :
|
|||
|
||||
|
||||
sub-common-plugins :
|
||||
for %d in ($(COMMON0)) do nmake -nologo -f makefile.msc sub-one-common DIR=%d TARGET=$(TARGET)
|
||||
for %d in ($(COMMON1)) do nmake -nologo -f makefile.msc sub-one-common DIR=%d TARGET=$(TARGET)
|
||||
for %d in ($(COMMON2)) do nmake -nologo -f makefile.msc sub-one-common DIR=%d TARGET=$(TARGET)
|
||||
for %d in ($(COMMON3)) do nmake -nologo -f makefile.msc sub-one-common DIR=%d TARGET=$(TARGET)
|
||||
|
|
@ -227,11 +229,13 @@ OBJECTS = \
|
|||
bmpwrite.obj
|
||||
!ENDIF
|
||||
|
||||
!IFDEF EXTRA_dbbrowser
|
||||
!IFDEF EXTRA_plugin_browser
|
||||
OBJECTS = \
|
||||
plugin-browser.obj
|
||||
!ENDIF
|
||||
|
||||
!IFDEF EXTRA_procedure_browser
|
||||
OBJECTS = \
|
||||
# gimpprocbox.obj \
|
||||
gimpprocbrowser.obj \
|
||||
gimpprocview.obj \
|
||||
procedure-browser.obj
|
||||
!ENDIF
|
||||
|
||||
|
|
@ -465,6 +469,17 @@ EXTRACFLAGS = -I$(MPEG)
|
|||
EXTRALIBS = $(MPEG)\release\libmpeg.lib
|
||||
!ENDIF
|
||||
|
||||
!IFDEF EXTRA_metadata
|
||||
OBJECTS = \
|
||||
base64.obj \
|
||||
interface.obj \
|
||||
metadata.obj \
|
||||
xmp-encode.obj \
|
||||
xmp-model.obj \
|
||||
xmp-parse.obj \
|
||||
xmp-schemas.obj
|
||||
!ENDIF
|
||||
|
||||
!IFDEF EXTRA_pagecurl
|
||||
STOCK_VARS = \
|
||||
curl0 curl0.png \
|
||||
|
|
@ -507,6 +522,11 @@ OBJECTS = \
|
|||
print-util.obj
|
||||
!ENDIF
|
||||
|
||||
!IFDEF EXTRA_gnomeprint
|
||||
EXTRACFLAGS = $(GNOMEPRINT_CFLAGS) $(LIBART_CFLAGS) $(GNOMECANVAS_CFLAGS) $(GNOMEPRINTUI_CFLAGS)
|
||||
EXTRALIBS = $(GNOMEPRINT_LIBS) $(GNOMEPRINTUI_LIBS)
|
||||
!ENDIF
|
||||
|
||||
!IFDEF EXTRA_psp
|
||||
EXTRACFLAGS = $(ZLIB_CFLAGS)
|
||||
EXTRALIBS = $(ZLIB_LIBS)
|
||||
|
|
@ -548,10 +568,8 @@ OBJECTS = \
|
|||
script-fu-scripts.obj \
|
||||
script-fu-text-console.obj \
|
||||
script-fu-interface.obj \
|
||||
script-fu-server.obj \
|
||||
..\dbbrowser\gimpprocbrowser.obj \
|
||||
..\dbbrowser\gimpprocbox.obj \
|
||||
..\dbbrowser\gimpprocview.obj
|
||||
script-fu-server.obj
|
||||
|
||||
EXTRALIBS = ..\..\regexrepl\regexrepl.lib siod\siod.lib kernel32.lib wsock32.lib
|
||||
EXTRACFLAGS = -DREGEX_MALLOC
|
||||
HAVE_RESOURCE = YES
|
||||
|
|
@ -624,6 +642,15 @@ OBJECTS = \
|
|||
utils.obj
|
||||
!ENDIF
|
||||
|
||||
!IFDEF EXTRA_help
|
||||
OBJECTS = \
|
||||
locales.obj \
|
||||
domain.obj \
|
||||
help.obj
|
||||
TEST_OBJECTS = \
|
||||
gimp-help-lookup.obj
|
||||
!ENDIF
|
||||
|
||||
!IFDEF EXTRA_helpbrowser
|
||||
OBJECTS = \
|
||||
gimpthrobber.obj \
|
||||
|
|
@ -822,12 +849,12 @@ install : all
|
|||
OBJECTS = $(MODULE).obj
|
||||
!ENDIF
|
||||
|
||||
$(MODULE).$(MODULE_EXT) : $(OBJECTS) $(MODULE).def
|
||||
$(MODULE).$(MODULE_EXT) : $(OBJECTS)
|
||||
$(CC) $(CFLAGS) -LD -Fe$@ $(OBJECTS) $(LDFLAGS) $(EXTRALIBS) \
|
||||
..\..\libgimp\gimp-$(GIMP_VER).lib ..\..\libgimp\gimpui-$(GIMP_VER).lib \
|
||||
..\..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \
|
||||
..\..\libgimpbase\gimpbase-$(GIMP_VER).lib \
|
||||
$(GLIB_LIBS) $(GTK2_LIBS) /def:$(MODULE).def
|
||||
$(GLIB_LIBS) $(GTK2_LIBS) /export:init$(MODULE)
|
||||
!ENDIF
|
||||
|
||||
.c.obj :
|
||||
|
|
|
|||
|
|
@ -1,7 +1,22 @@
|
|||
MODULE = gimp
|
||||
!IFNDEF MODULE
|
||||
|
||||
MODULES = gimp _gimpenums gimpcolor gimpprocbrowser
|
||||
|
||||
all : sub-all
|
||||
|
||||
sub-all:
|
||||
for %d in ($(MODULES)) do @nmake -nologo -f makefile.msc sub-one THIS=%d
|
||||
|
||||
sub-one:
|
||||
nmake -nologo -f makefile.msc all MODULE=$(THIS) OBJ_$(THIS)=1
|
||||
|
||||
!ELSE
|
||||
|
||||
MODULE=$(MODULE)
|
||||
#OPTIMIZE = -Od -Op
|
||||
#DEBUG=1
|
||||
|
||||
!IFDEF OBJ_gimp
|
||||
OBJECTS = \
|
||||
gimpmodule.obj \
|
||||
pygimp-image.obj \
|
||||
|
|
@ -10,6 +25,23 @@ OBJECTS = \
|
|||
pygimp-display.obj \
|
||||
pygimp-parasite.obj \
|
||||
pygimp-pdb.obj
|
||||
!ENDIF
|
||||
|
||||
!IFDEF OBJ__gimpenums
|
||||
OBJECTS = \
|
||||
gimpenumsmodule.obj
|
||||
!ENDIF
|
||||
|
||||
!IFDEF OBJ_gimpcolor
|
||||
OBJECTS = \
|
||||
gimpcolormodule.obj \
|
||||
pygimp-rgb.obj
|
||||
!ENDIF
|
||||
|
||||
!IFDEF OBJ_gimpprocbrowser
|
||||
OBJECTS = \
|
||||
procbrowser.obj
|
||||
!ENDIF
|
||||
|
||||
PYTHON = ..\..\..\..\python23
|
||||
!IFNDEF DEBUG
|
||||
|
|
@ -18,10 +50,12 @@ EXTRALIBS = $(PYTHON)\libs\python23.lib user32.lib
|
|||
EXTRALIBS = $(PYTHON)\libs\python23_d.lib user32.lib
|
||||
!ENDIF
|
||||
|
||||
EXTRACFLAGS = -I$(PYTHON)\include
|
||||
EXTRACFLAGS = -I$(PYTHON)\include -I $(TOP)\gnome-python\pygtk\gobject
|
||||
GIMPTOP=..\..
|
||||
|
||||
# Lib Extension is
|
||||
MODULE_EXT = pyd
|
||||
|
||||
!include ..\makefile.msc
|
||||
|
||||
!ENDIF
|
||||
|
|
|
|||
|
|
@ -82,6 +82,10 @@
|
|||
#define LOAD_PROC "file-xjt-load"
|
||||
#define SAVE_PROC "file-xjt-save"
|
||||
|
||||
#ifdef _MSC_VER
|
||||
typedef int pid_t;
|
||||
#endif
|
||||
|
||||
#define GIMP_XJ_IMAGE "GIMP_XJ_IMAGE"
|
||||
|
||||
#define SCALE_WIDTH 125
|
||||
|
|
|
|||
|
|
@ -145,8 +145,8 @@ STOCK_VARIABLES = \
|
|||
stock_portrait_16 stock-portrait-16.png \
|
||||
stock_print_resolution_16 stock-print-resolution-16.png \
|
||||
stock_print_resolution_24 stock-print-resolution-24.png \
|
||||
stock_qmask_off_16 stock-qmask-off-16.png \
|
||||
stock_qmask_on_16 stock-qmask-on-16.png \
|
||||
stock_quick_mask_off_16 stock-quick-mask-off-16.png \
|
||||
stock_quick_mask_on_16 stock-quick-mask-on-16.png \
|
||||
stock_question_64 stock-question-64.png \
|
||||
stock_reset_16 stock-reset-16.png \
|
||||
stock_reshow_filter_16 stock-reshow-filter-16.png \
|
||||
|
|
@ -243,6 +243,8 @@ STOCK_TOOL_VARIABLES = \
|
|||
stock_tool_eraser_22 tools/stock-tool-eraser-22.png \
|
||||
stock_tool_flip_16 tools/stock-tool-flip-16.png \
|
||||
stock_tool_flip_22 tools/stock-tool-flip-22.png \
|
||||
stock_tool_foreground_select_16 tools/stock-tool-foreground-select-16.png \
|
||||
stock_tool_foreground_select_22 tools/stock-tool-foreground-select-22.png \
|
||||
stock_tool_free_select_16 tools/stock-tool-free-select-16.png \
|
||||
stock_tool_free_select_22 tools/stock-tool-free-select-22.png \
|
||||
stock_tool_fuzzy_select_16 tools/stock-tool-fuzzy-select-16.png \
|
||||
|
|
|
|||
Loading…
Reference in New Issue