mirror of https://github.com/GNOME/gimp.git
Test for help_path being non-NULL was wrong way.
2000-06-07 Tor Lillqvist <tml@iki.fi>
* app/gimphelp.c (gimp_help_netscape): Test for help_path being
non-NULL was wrong way.
* app/preferences_dialog.c (file_pref_cmd_callback): Change
"From X Server" to "From windowing system".
* app/makefile.cygwin: Update according to file name changes.
* libgimp/gimp.def
* libgimp/gimpui.def
* libgimp/makefile.{cygwin,msc}: Update for Mitch's and Sven's
changes.
* plug-ins/libgck/gck/gckcolor.c: Include <glib.h> before
gimpmath.h, so G_PI don't get redefined when glib.h is included
later.
From Hans Breuer, portability fixes for MSVC compilation:
* app/dialog_handler.h: Bypass decalration of exported functions
which are marked with G_MODULE_EXPORT in dialog_handler.c when
compiling that file. Otherwise some compilers will get confused.
* app/dialog_handler.c: Define a test macro for above bypass.
* plug-ins/MapObject/mapobject_apply.c
* plug-ins/MapObject/mapobject_image.c
* plug-ins/MapObject/mapobject_shade.c: Include <string.h>.
* plug-ins/flame/flame.c: Define S_ISREG if needed.
* plug-ins/makefile.{cygwin,msc}: Updates.
* plug-ins/sel2path/global.h: Include <stdlib.h>.
* plug-ins/winsnap/winsnap.c: Include libgimp/gimpui.h.
This commit is contained in:
Tor Lillqvist
Tor Lillqvist
parent
a5f9aa90da
commit
0285191fda
41
ChangeLog
41
ChangeLog
|
|
@ -1,5 +1,44 @@
|
|||
2000-06-07 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* app/gimphelp.c (gimp_help_netscape): Test for help_path being
|
||||
non-NULL was wrong way.
|
||||
|
||||
* app/preferences_dialog.c (file_pref_cmd_callback): Change
|
||||
"From X Server" to "From windowing system".
|
||||
|
||||
* app/makefile.cygwin: Update according to file name changes.
|
||||
|
||||
* libgimp/gimp.def
|
||||
* libgimp/gimpui.def
|
||||
* libgimp/makefile.{cygwin,msc}: Update for Mitch's and Sven's
|
||||
changes.
|
||||
|
||||
* plug-ins/libgck/gck/gckcolor.c: Include <glib.h> before
|
||||
gimpmath.h, so G_PI don't get redefined when glib.h is included
|
||||
later.
|
||||
|
||||
From Hans Breuer, portability fixes for MSVC compilation:
|
||||
|
||||
* app/dialog_handler.h: Bypass decalration of exported functions
|
||||
which are marked with G_MODULE_EXPORT in dialog_handler.c when
|
||||
compiling that file. Otherwise some compilers will get confused.
|
||||
|
||||
* app/dialog_handler.c: Define a test macro for above bypass.
|
||||
|
||||
* plug-ins/MapObject/mapobject_apply.c
|
||||
* plug-ins/MapObject/mapobject_image.c
|
||||
* plug-ins/MapObject/mapobject_shade.c: Include <string.h>.
|
||||
|
||||
* plug-ins/flame/flame.c: Define S_ISREG if needed.
|
||||
|
||||
* plug-ins/makefile.{cygwin,msc}: Updates.
|
||||
|
||||
* plug-ins/sel2path/global.h: Include <stdlib.h>.
|
||||
|
||||
* plug-ins/winsnap/winsnap.c: Include libgimp/gimpui.h.
|
||||
|
||||
2000-06-05 Sven Neumann <sven@gimp.org>
|
||||
|
||||
|
||||
* plug-ins/script-fu/scripts/ripply-anim.scm
|
||||
* plug-ins/script-fu/scripts/spinning_globe.scm
|
||||
* plug-ins/script-fu/scripts/waves-anim.scm: applied
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@
|
|||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#define __DIALOG_HANDLER_C__ 1
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#include <gmodule.h>
|
||||
|
|
|
|||
|
|
@ -19,8 +19,13 @@
|
|||
#ifndef __DIALOG_HANDLER_H_
|
||||
#define __DIALOG_HANDLER_H_
|
||||
|
||||
#ifndef __DIALOG_HANDLER_C_
|
||||
/* Bypass these declarations when compiling the file with the definitions,
|
||||
* because of the G_MODULE_EXPORT attribute in it.
|
||||
*/
|
||||
void dialog_register (GtkWidget *dialog);
|
||||
void dialog_unregister (GtkWidget *dialog);
|
||||
#endif
|
||||
|
||||
void dialog_register_toolbox (GtkWidget *dialog);
|
||||
void dialog_register_fileload (GtkWidget *dialog);
|
||||
|
|
|
|||
|
|
@ -2406,7 +2406,7 @@ file_pref_cmd_callback (GtkWidget *widget,
|
|||
gtk_widget_set_sensitive (sizeentry, !using_xserver_resolution);
|
||||
|
||||
group = NULL;
|
||||
button = gtk_radio_button_new_with_label (group, _("From X Server"));
|
||||
button = gtk_radio_button_new_with_label (group, _("From windowing system"));
|
||||
group = gtk_radio_button_group (GTK_RADIO_BUTTON (button));
|
||||
gtk_signal_connect (GTK_OBJECT (button), "toggled",
|
||||
GTK_SIGNAL_FUNC (file_prefs_res_source_callback),
|
||||
|
|
|
|||
|
|
@ -217,7 +217,7 @@ gimp_help_netscape (gchar *help_path,
|
|||
}
|
||||
else
|
||||
{
|
||||
if (help_path)
|
||||
if (!help_path)
|
||||
{
|
||||
url = g_strconcat ("file:",
|
||||
gimp_data_directory (),
|
||||
|
|
|
|||
|
|
@ -2406,7 +2406,7 @@ file_pref_cmd_callback (GtkWidget *widget,
|
|||
gtk_widget_set_sensitive (sizeentry, !using_xserver_resolution);
|
||||
|
||||
group = NULL;
|
||||
button = gtk_radio_button_new_with_label (group, _("From X Server"));
|
||||
button = gtk_radio_button_new_with_label (group, _("From windowing system"));
|
||||
group = gtk_radio_button_group (GTK_RADIO_BUTTON (button));
|
||||
gtk_signal_connect (GTK_OBJECT (button), "toggled",
|
||||
GTK_SIGNAL_FUNC (file_prefs_res_source_callback),
|
||||
|
|
|
|||
|
|
@ -101,6 +101,7 @@ gimp_OBJECTS = \
|
|||
devices.o \
|
||||
dialog_handler.o \
|
||||
disp_callbacks.o \
|
||||
display_cmds.o \
|
||||
docindex.o \
|
||||
dodgeburn.o \
|
||||
draw_core.o \
|
||||
|
|
@ -122,15 +123,12 @@ gimp_OBJECTS = \
|
|||
free_select.o \
|
||||
fuzzy_select.o \
|
||||
gdisplay.o \
|
||||
gdisplay_cmds.o \
|
||||
gdisplay_color.o \
|
||||
gdisplay_color_ui.o \
|
||||
gdisplay_ops.o \
|
||||
general.o \
|
||||
gimage.o \
|
||||
gimage_cmds.o \
|
||||
gimage_mask.o \
|
||||
gimage_mask_cmds.o \
|
||||
gimpbrush.o \
|
||||
gimpbrushgenerated.o \
|
||||
gimpbrushlist.o \
|
||||
|
|
@ -139,7 +137,6 @@ gimp_OBJECTS = \
|
|||
gimpcontextpreview.o \
|
||||
gimpdnd.o \
|
||||
gimphelp.o \
|
||||
gimphelp_cmds.o \
|
||||
gimphistogram.o \
|
||||
gimplist.o \
|
||||
gimplut.o \
|
||||
|
|
@ -154,14 +151,17 @@ gimp_OBJECTS = \
|
|||
gradient_cmds.o \
|
||||
gradient_select.o \
|
||||
gradient_select_cmds.o \
|
||||
gradients_cmds.o \
|
||||
guides_cmds.o \
|
||||
gtkwrapbox.o \
|
||||
gtkhwrapbox.o \
|
||||
gtkvwrapbox.o \
|
||||
gximage.o \
|
||||
help_cmds.o \
|
||||
histogramwidget.o \
|
||||
histogram_tool.o \
|
||||
hue_saturation.o \
|
||||
image_cmds.o \
|
||||
image_map.o \
|
||||
image_new.o \
|
||||
image_render.o \
|
||||
|
|
@ -170,7 +170,6 @@ gimp_OBJECTS = \
|
|||
info_window.o \
|
||||
ink.o \
|
||||
interface.o \
|
||||
interface_cmds.o \
|
||||
internal_procs.o \
|
||||
invert.o \
|
||||
iscissors.o \
|
||||
|
|
@ -185,6 +184,7 @@ gimp_OBJECTS = \
|
|||
main.o \
|
||||
measure.o \
|
||||
menus.o \
|
||||
message_cmds.o \
|
||||
misc_cmds.o \
|
||||
module_db.o \
|
||||
move.o \
|
||||
|
|
@ -225,6 +225,7 @@ gimp_OBJECTS = \
|
|||
scan_convert.o \
|
||||
scroll.o \
|
||||
selection.o \
|
||||
selection_cmds.o \
|
||||
session.o \
|
||||
shear_tool.o \
|
||||
smudge.o \
|
||||
|
|
|
|||
|
|
@ -2406,7 +2406,7 @@ file_pref_cmd_callback (GtkWidget *widget,
|
|||
gtk_widget_set_sensitive (sizeentry, !using_xserver_resolution);
|
||||
|
||||
group = NULL;
|
||||
button = gtk_radio_button_new_with_label (group, _("From X Server"));
|
||||
button = gtk_radio_button_new_with_label (group, _("From windowing system"));
|
||||
group = gtk_radio_button_group (GTK_RADIO_BUTTON (button));
|
||||
gtk_signal_connect (GTK_OBJECT (button), "toggled",
|
||||
GTK_SIGNAL_FUNC (file_prefs_res_source_callback),
|
||||
|
|
|
|||
|
|
@ -217,7 +217,7 @@ gimp_help_netscape (gchar *help_path,
|
|||
}
|
||||
else
|
||||
{
|
||||
if (help_path)
|
||||
if (!help_path)
|
||||
{
|
||||
url = g_strconcat ("file:",
|
||||
gimp_data_directory (),
|
||||
|
|
|
|||
|
|
@ -1,24 +1,27 @@
|
|||
EXPORTS
|
||||
gimp_attach_new_parasite
|
||||
gimp_brushes_close_popup
|
||||
gimp_brushes_get_brush_data
|
||||
gimp_brushes_set_popup
|
||||
gimp_channel_copy
|
||||
gimp_channel_delete
|
||||
gimp_channel_get_color
|
||||
gimp_channel_get_image_id
|
||||
gimp_channel_get_layer_id
|
||||
gimp_channel_get_name
|
||||
gimp_channel_get_opacity
|
||||
gimp_channel_get_show_masked
|
||||
gimp_channel_get_tattoo
|
||||
gimp_channel_get_visible
|
||||
gimp_channel_height
|
||||
gimp_channel_new
|
||||
gimp_channel_ops_duplicate
|
||||
gimp_channel_set_color
|
||||
gimp_channel_set_name
|
||||
gimp_channel_set_opacity
|
||||
gimp_channel_set_show_masked
|
||||
gimp_channel_set_visible
|
||||
gimp_channel_width
|
||||
gimp_color_cube
|
||||
gimp_convert_grayscale
|
||||
gimp_convert_indexed
|
||||
gimp_convert_rgb
|
||||
gimp_data_directory
|
||||
gimp_default_display
|
||||
gimp_destroy_paramdefs
|
||||
|
|
@ -28,7 +31,7 @@ EXPORTS
|
|||
gimp_display_new
|
||||
gimp_displays_flush
|
||||
gimp_drawable_attach_new_parasite
|
||||
gimp_drawable_bpp
|
||||
gimp_drawable_bytes
|
||||
gimp_drawable_delete
|
||||
gimp_drawable_detach
|
||||
gimp_drawable_fill
|
||||
|
|
@ -39,7 +42,7 @@ EXPORTS
|
|||
gimp_drawable_get_tile2
|
||||
gimp_drawable_has_alpha
|
||||
gimp_drawable_height
|
||||
gimp_drawable_image_id
|
||||
gimp_drawable_image
|
||||
gimp_drawable_is_channel
|
||||
gimp_drawable_is_gray
|
||||
gimp_drawable_is_indexed
|
||||
|
|
@ -62,14 +65,15 @@ EXPORTS
|
|||
gimp_extension_ack
|
||||
gimp_extension_process
|
||||
gimp_gamma
|
||||
gimp_get_data
|
||||
gimp_get_data_size
|
||||
gimp_get_progname
|
||||
gimp_gradients_close_popup
|
||||
gimp_gradients_get_active
|
||||
gimp_gradients_get_gradient_data
|
||||
gimp_gradients_get_list
|
||||
gimp_gradients_sample_custom
|
||||
gimp_gradients_sample_uniform
|
||||
gimp_gradients_set_active
|
||||
gimp_gradients_set_popup
|
||||
gimp_gtkrc
|
||||
gimp_help
|
||||
gimp_hls_to_rgb
|
||||
|
|
@ -84,12 +88,8 @@ EXPORTS
|
|||
gimp_image_attach_new_parasite
|
||||
gimp_image_base_type
|
||||
gimp_image_clean_all
|
||||
gimp_image_convert_grayscale
|
||||
gimp_image_convert_indexed
|
||||
gimp_image_convert_rgb
|
||||
gimp_image_delete
|
||||
gimp_image_delete_guide
|
||||
gimp_image_duplicate
|
||||
gimp_image_find_next_guide
|
||||
gimp_image_flatten
|
||||
gimp_image_floating_selection
|
||||
|
|
@ -110,6 +110,7 @@ EXPORTS
|
|||
gimp_image_get_thumbnail_data
|
||||
gimp_image_get_unit
|
||||
gimp_image_height
|
||||
gimp_image_list
|
||||
gimp_image_lower_channel
|
||||
gimp_image_lower_layer
|
||||
gimp_image_merge_visible_layers
|
||||
|
|
@ -141,23 +142,20 @@ EXPORTS
|
|||
gimp_install_procedure
|
||||
gimp_install_temp_proc
|
||||
gimp_layer_add_alpha
|
||||
gimp_layer_bpp
|
||||
gimp_layer_copy
|
||||
gimp_layer_create_mask
|
||||
gimp_layer_delete
|
||||
gimp_layer_get_apply_mask
|
||||
gimp_layer_get_edit_mask
|
||||
gimp_layer_get_image_id
|
||||
gimp_layer_get_mask_id
|
||||
gimp_layer_get_mode
|
||||
gimp_layer_get_name
|
||||
gimp_layer_get_opacity
|
||||
gimp_layer_get_preserve_transparency
|
||||
gimp_layer_get_preserve_trans
|
||||
gimp_layer_get_show_mask
|
||||
gimp_layer_get_tattoo
|
||||
gimp_layer_get_visible
|
||||
gimp_layer_height
|
||||
gimp_layer_is_floating_selection
|
||||
gimp_layer_is_floating_sel
|
||||
gimp_layer_mask
|
||||
gimp_layer_new
|
||||
gimp_layer_resize
|
||||
gimp_layer_scale
|
||||
|
|
@ -167,12 +165,10 @@ EXPORTS
|
|||
gimp_layer_set_name
|
||||
gimp_layer_set_offsets
|
||||
gimp_layer_set_opacity
|
||||
gimp_layer_set_preserve_transparency
|
||||
gimp_layer_set_preserve_trans
|
||||
gimp_layer_set_show_mask
|
||||
gimp_layer_set_visible
|
||||
gimp_layer_translate
|
||||
gimp_layer_type
|
||||
gimp_layer_width
|
||||
gimp_main
|
||||
gimp_major_version
|
||||
gimp_matrix3_determinant
|
||||
|
|
@ -217,6 +213,9 @@ EXPORTS
|
|||
gimp_path_get_user_writable_dir
|
||||
gimp_path_parse
|
||||
gimp_path_to_str
|
||||
gimp_patterns_close_popup
|
||||
gimp_patterns_get_pattern_data
|
||||
gimp_patterns_set_popup
|
||||
gimp_personal_rc_file
|
||||
gimp_pixel_rgn_get_col
|
||||
gimp_pixel_rgn_get_pixel
|
||||
|
|
@ -231,17 +230,18 @@ EXPORTS
|
|||
gimp_pixel_rgns_process
|
||||
gimp_pixel_rgns_register
|
||||
gimp_pixel_rgns_register2
|
||||
gimp_pixpipe_params_init
|
||||
gimp_pixpipe_params_build
|
||||
gimp_pixpipe_params_init
|
||||
gimp_pixpipe_params_parse
|
||||
gimp_plugin_domain_add
|
||||
gimp_plugin_domain_add_with_path
|
||||
gimp_plugin_domain_register
|
||||
gimp_plugin_help_register
|
||||
gimp_procedural_db_get_data
|
||||
gimp_procedural_db_proc_info
|
||||
gimp_procedural_db_query
|
||||
gimp_procedural_db_set_data
|
||||
gimp_procedural_db_get_data_size
|
||||
gimp_progress_init
|
||||
gimp_progress_update
|
||||
gimp_query_database
|
||||
gimp_query_images
|
||||
gimp_query_procedure
|
||||
gimp_quit
|
||||
gimp_register_load_handler
|
||||
gimp_register_magic_load_handler
|
||||
|
|
@ -259,7 +259,6 @@ EXPORTS
|
|||
gimp_selection_float
|
||||
gimp_selection_is_empty
|
||||
gimp_selection_none
|
||||
gimp_set_data
|
||||
gimp_standard_help_func
|
||||
gimp_tile_cache_ntiles
|
||||
gimp_tile_cache_size
|
||||
|
|
|
|||
|
|
@ -26,12 +26,9 @@ EXPORTS
|
|||
gimp_file_selection_new
|
||||
gimp_file_selection_set_filename
|
||||
gimp_float_adjustment_update
|
||||
gimp_gradient_close_popup
|
||||
gimp_gradient_get_gradient_data
|
||||
gimp_gradient_select_widget
|
||||
gimp_gradient_select_widget_close_popup
|
||||
gimp_gradient_select_widget_set_popup
|
||||
gimp_gradient_set_popup
|
||||
gimp_help_connect_help_accel
|
||||
gimp_help_disable_tooltips
|
||||
gimp_help_enable_tooltips
|
||||
|
|
@ -50,12 +47,9 @@ EXPORTS
|
|||
gimp_path_editor_get_path
|
||||
gimp_path_editor_get_type
|
||||
gimp_path_editor_new
|
||||
gimp_pattern_close_popup
|
||||
gimp_pattern_get_pattern_data
|
||||
gimp_pattern_select_widget
|
||||
gimp_pattern_select_widget_close_popup
|
||||
gimp_pattern_select_widget_set_popup
|
||||
gimp_pattern_set_popup
|
||||
gimp_pixmap_button_new
|
||||
gimp_pixmap_get_type
|
||||
gimp_pixmap_new
|
||||
|
|
|
|||
|
|
@ -27,6 +27,38 @@ all : \
|
|||
../config.h : ../config.h.win32
|
||||
cp $@ $<
|
||||
|
||||
PDB_WRAPPERS_O = \
|
||||
gimpbrushes_pdb.o \
|
||||
gimpbrushselect_pdb.o \
|
||||
gimpchannel_pdb.o \
|
||||
gimpchannelops_pdb.o \
|
||||
gimpcolor_pdb.o \
|
||||
gimpconvert_pdb.o \
|
||||
gimpdisplay_pdb.o \
|
||||
gimpdrawable_pdb.o \
|
||||
gimpedit_pdb.o \
|
||||
gimpfileops_pdb.o \
|
||||
gimpfloatingsel_pdb.o \
|
||||
gimpgimprc_pdb.o \
|
||||
gimpgradients_pdb.o \
|
||||
gimpgradientselect_pdb.o \
|
||||
gimpguides_pdb.o \
|
||||
gimphelp_pdb.o \
|
||||
gimpimage_pdb.o \
|
||||
gimplayer_pdb.o \
|
||||
gimpmessage_pdb.o \
|
||||
gimppalette_pdb.o \
|
||||
gimpparasite_pdb.o \
|
||||
gimppatterns_pdb.o \
|
||||
gimppatternselect_pdb.o \
|
||||
gimpplugin_pdb.o \
|
||||
gimpproceduraldb_pdb.o \
|
||||
gimpselection_pdb.o \
|
||||
gimptexttool_pdb.o \
|
||||
gimptools_pdb.o \
|
||||
gimpundo_pdb.o \
|
||||
gimpunit_pdb.o
|
||||
|
||||
gimpi_OBJECTS = \
|
||||
gimpenv.o \
|
||||
gimpchainbutton.o \
|
||||
|
|
@ -44,6 +76,7 @@ gimpi_OBJECTS = \
|
|||
gimpquerybox.o \
|
||||
gimpsizeentry.o \
|
||||
gimpunitmenu.o \
|
||||
gimputils.c \
|
||||
gimpvector.o \
|
||||
gimpwidgets.o \
|
||||
gimpwire.o
|
||||
|
|
@ -53,25 +86,24 @@ libgimpi.a : $(gimpi_OBJECTS)
|
|||
|
||||
gimp_OBJECTS = \
|
||||
gimp.o \
|
||||
gimpchannel_pdb.o \
|
||||
$(PDB_WRAPPERS_O) \
|
||||
gimpchannel.o \
|
||||
gimpcolorspace.o \
|
||||
gimpdisplay_pdb.o \
|
||||
gimpdrawable_pdb.o \
|
||||
gimpdrawable.o \
|
||||
gimpenv.o \
|
||||
gimpgradient_pdb.o \
|
||||
gimphelp_pdb.o \
|
||||
gimpimage_pdb.o \
|
||||
gimplayer_pdb.o \
|
||||
gimpgradientselect.o \
|
||||
gimphelp.o \
|
||||
gimpimage.o \
|
||||
gimplayer.o \
|
||||
gimpmatrix.o \
|
||||
gimppalette_pdb.o \
|
||||
gimpparasite.o \
|
||||
gimpparasite_pdb.o \
|
||||
gimpparasiteio.o \
|
||||
gimppixelrgn.o \
|
||||
gimpproceduraldb.o \
|
||||
gimpprotocol.o \
|
||||
gimpselection_pdb.o \
|
||||
gimpselection.o \
|
||||
gimptile.o \
|
||||
gimpunit_pdb.o \
|
||||
gimpunit.o \
|
||||
gimpvector.o \
|
||||
gimpwire.o
|
||||
|
||||
|
|
|
|||
|
|
@ -42,9 +42,9 @@ INTL = ..\..\intl
|
|||
CFLAGS = -I.. -I$(GLIB) -I$(GTK)\gdk -I$(GTK)\gdk -I$(GTK) -I$(INTL) -DGIMPDIR=\"$(GIMPDIR)\"
|
||||
|
||||
all : \
|
||||
..\config.h \
|
||||
gimpi.lib \
|
||||
gimp-$(GIMP_VER).dll \
|
||||
..\config.h \
|
||||
gimpi.lib \
|
||||
gimp-$(GIMP_VER).dll \
|
||||
gimpui-$(GIMP_VER).dll
|
||||
|
||||
..\config.h : ..\config.h.win32
|
||||
|
|
@ -54,6 +54,38 @@ install : all
|
|||
$(INSTALL) gimp-$(GIMP_VER).dll $(BIN)
|
||||
$(INSTALL) gimpui-$(GIMP_VER).dll $(BIN)
|
||||
|
||||
PDB_WRAPPERS_O = \
|
||||
gimpbrushes_pdb.obj \
|
||||
gimpbrushselect_pdb.obj \
|
||||
gimpchannel_pdb.obj \
|
||||
gimpchannelops_pdb.obj \
|
||||
gimpcolor_pdb.obj \
|
||||
gimpconvert_pdb.obj \
|
||||
gimpdisplay_pdb.obj \
|
||||
gimpdrawable_pdb.obj \
|
||||
gimpedit_pdb.obj \
|
||||
gimpfileops_pdb.obj \
|
||||
gimpfloatingsel_pdb.obj \
|
||||
gimpgimprc_pdb.obj \
|
||||
gimpgradients_pdb.obj \
|
||||
gimpgradientselect_pdb.obj \
|
||||
gimpguides_pdb.obj \
|
||||
gimphelp_pdb.obj \
|
||||
gimpimage_pdb.obj \
|
||||
gimplayer_pdb.obj \
|
||||
gimpmessage_pdb.obj \
|
||||
gimppalette_pdb.obj \
|
||||
gimpparasite_pdb.obj \
|
||||
gimppatterns_pdb.obj \
|
||||
gimppatternselect_pdb.obj \
|
||||
gimpplugin_pdb.obj \
|
||||
gimpproceduraldb_pdb.obj \
|
||||
gimpselection_pdb.obj \
|
||||
gimptexttool_pdb.obj \
|
||||
gimptools_pdb.obj \
|
||||
gimpundo_pdb.obj \
|
||||
gimpunit_pdb.obj
|
||||
|
||||
gimpi_OBJECTS = \
|
||||
gimpenv.obj \
|
||||
gimpchainbutton.obj \
|
||||
|
|
@ -63,43 +95,42 @@ gimpi_OBJECTS = \
|
|||
gimpfileselection.obj \
|
||||
gimphelpui.obj \
|
||||
gimpmatrix.obj \
|
||||
gimpparasite.obj \
|
||||
gimpparasiteio.obj \
|
||||
gimppatheditor.obj \
|
||||
gimppixmap.obj \
|
||||
gimpprotocol.obj \
|
||||
gimpquerybox.obj \
|
||||
gimpsizeentry.obj \
|
||||
gimpunitmenu.obj \
|
||||
gimputils.c \
|
||||
gimpvector.obj \
|
||||
gimpwidgets.obj \
|
||||
gimpwire.obj \
|
||||
gserialize.obj \
|
||||
parasite.obj \
|
||||
parasiteio.obj
|
||||
gimpwire.obj
|
||||
|
||||
gimpi.lib : $(gimpi_OBJECTS)
|
||||
lib /out:gimpi.lib $(gimpi_OBJECTS)
|
||||
|
||||
gimp_OBJECTS = \
|
||||
gimp.obj \
|
||||
gimpchannel_pdb.obj \
|
||||
$(PDB_WRAPPERS_O) \
|
||||
gimpchannel.obj \
|
||||
gimpcolorspace.obj \
|
||||
gimpdisplay_pdb.obj \
|
||||
gimpdrawable_pdb.obj \
|
||||
gimpdrawable.obj \
|
||||
gimpenv.obj \
|
||||
gimpgradient_pdb.obj \
|
||||
gimphelp_pdb.obj \
|
||||
gimpimage_pdb.obj \
|
||||
gimplayer_pdb.obj \
|
||||
gimpgradientselect.obj \
|
||||
gimphelp.obj \
|
||||
gimpimage.obj \
|
||||
gimplayer.obj \
|
||||
gimpmatrix.obj \
|
||||
gimppalette_pdb.obj \
|
||||
gimpparasite.obj \
|
||||
gimpparasite_pdb.obj \
|
||||
gimpparasiteio.obj \
|
||||
gimppixelrgn.obj \
|
||||
gimpproceduraldb.obj \
|
||||
gimpprotocol.obj \
|
||||
gimpselection_pdb.obj \
|
||||
gimpselection.obj \
|
||||
gimptile.obj \
|
||||
gimpunit_pdb.obj \
|
||||
gimpunit.obj \
|
||||
gimpvector.obj \
|
||||
gimpwire.obj
|
||||
|
||||
|
|
@ -119,8 +150,8 @@ gimpui_OBJECTS = \
|
|||
gimpdialog.obj \
|
||||
gimpexport.obj \
|
||||
gimpfileselection.obj \
|
||||
gimpgradientmenu.obj \
|
||||
gimphelpui.obj \
|
||||
gimpgradientmenu.obj \
|
||||
gimppatheditor.obj \
|
||||
gimppatternmenu.obj \
|
||||
gimppixmap.obj \
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@
|
|||
/* Apply mapping and shading on the whole input image */
|
||||
/******************************************************/
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#include <libgimp/gimp.h>
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@
|
|||
/* mapobject_preview.c and mapobject_apply.c */
|
||||
/*********************************************************/
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include <sys/types.h>
|
||||
|
||||
#include <gck/gck.h>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@
|
|||
/* Shading stuff */
|
||||
/*****************/
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include <libgimp/gimp.h>
|
||||
|
||||
#include <gck/gck.h>
|
||||
|
|
|
|||
|
|
@ -39,6 +39,13 @@
|
|||
|
||||
#include "libgimp/stdplugins-intl.h"
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
# include <io.h>
|
||||
# ifndef S_ISREG
|
||||
# define S_ISREG(m) ((m) & _S_IFREG)
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#include "flame.h"
|
||||
|
||||
#define VARIATION_SAME (-2)
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@
|
|||
|
||||
#include "stdlib.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include "libgimp/gimpmath.h"
|
||||
|
||||
#include "gck.h"
|
||||
|
|
|
|||
|
|
@ -211,7 +211,6 @@ OBJECTS = \
|
|||
cmap.o \
|
||||
flame.o \
|
||||
libifs.o \
|
||||
megawidget.o \
|
||||
rect.o
|
||||
endif
|
||||
|
||||
|
|
@ -617,7 +616,7 @@ $(PLUGIN).exe : $(OBJECTS) $(RESOURCE)
|
|||
$(CC) $(CFLAGS) -mwindows -s -o $(PLUGIN).exe $(OBJECTS) $(RESOURCE) -L $(PLUGINDIR)/libgck/gck -lgck -L ../../libgimp -lgimp-$(GIMP_VER) -lgimpui-$(GIMP_VER) -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GTK)/gdk -lgdk-$(GTK_VER) -L $(INTL) -lgnu-intl -L $(GLIB) -lglib-$(GLIB_VER) $(EXTRALIBS) $(LDFLAGS)
|
||||
|
||||
# Kludge to get the path to the win32 headers
|
||||
WIN32APIHEADERS = $(shell echo "\#include <winver.h>" | $(CC) -M -E - | tail -1 | sed -e 's!/winver.h!!')
|
||||
WIN32APIHEADERS=$(shell echo "\#include <winver.h>" | $(CC) -M -E - | tail -1 | sed -e 's![\\/]winver.h!!' | tr -d '\015')
|
||||
|
||||
$(PLUGIN)res.o : $(PLUGIN).rc
|
||||
windres --include-dir $(WIN32APIHEADERS) $(PLUGIN).rc $(PLUGIN)res.o
|
||||
|
|
|
|||
|
|
@ -160,7 +160,6 @@ guash-data-install :
|
|||
|
||||
!IFDEF EXTRA_FractalExplorer
|
||||
OBJECTS = \
|
||||
Callbacks.obj \
|
||||
Dialogs.obj \
|
||||
Events.obj \
|
||||
FractalExplorer.obj \
|
||||
|
|
@ -220,7 +219,6 @@ OBJECTS = \
|
|||
cmap.obj \
|
||||
flame.obj \
|
||||
libifs.obj \
|
||||
megawidget.obj \
|
||||
rect.obj
|
||||
!ENDIF
|
||||
|
||||
|
|
@ -528,6 +526,10 @@ OBJECTS = \
|
|||
EXTRALIBS = user32.lib
|
||||
!ENDIF
|
||||
|
||||
!IFDEF EXTRA_webbrowser
|
||||
EXTRALIBS = shell32.lib
|
||||
!ENDIF
|
||||
|
||||
!IFDEF EXTRA_winprint
|
||||
EXTRALIBS = user32.lib gdi32.lib comdlg32.lib
|
||||
!endif
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
|
|||
#ifndef GLOBAL_H
|
||||
#define GLOBAL_H
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "types.h"
|
||||
|
||||
/* Define common sorts of messages. */
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@
|
|||
#include <gtk/gtk.h>
|
||||
|
||||
#include "libgimp/gimp.h"
|
||||
#include "libgimp/gimpui.h"
|
||||
#include "libgimp/stdplugins-intl.h"
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in New Issue