Commit d9ac028c authored by Hans Breuer's avatar Hans Breuer Committed by Hans Breuer

updated dont include "gimpmessagedialog.c" to avoid redefinitions. Instead

2005-07-10  Hans Breuer  <hans@breuer.org>

	* **/makefile.msc app/gimpcore.def : updated
	* app/widgets/gimpcontrollerlist.c : dont include
	"gimpmessagedialog.c" to avoid redefinitions.
	Instead include gimpmessagebox.h and gimpmessagedialog.h

	* plug-ins/common/raw.c : include <io.h>
	* plug-ins/common/screenshot.c : make it compile. It
	still has no code to actually work on win32.
parent c938c782
2005-07-10 Hans Breuer <hans@breuer.org>
* **/makefile.msc app/gimpcore.def : updated
* app/widgets/gimpcontrollerlist.c : dont include
"gimpmessagedialog.c" to avoid redefinitions.
Instead include gimpmessagebox.h and gimpmessagedialog.h
* plug-ins/common/raw.c : include <io.h>
* plug-ins/common/screenshot.c : make it compile. It
still has no code to actually work on win32.
2005-07-10 Sven Neumann <sven@gimp.org>
* app/base/segmentator.[ch]: ported to GIMP data structures. There
......
......@@ -34,6 +34,8 @@ OBJECTS = \
colormap-editor-commands.obj \
context-actions.obj \
context-commands.obj \
cursor-info-actions.obj \
cursor-info-commands.obj \
data-commands.obj \
debug-actions.obj \
debug-commands.obj \
......@@ -76,6 +78,8 @@ OBJECTS = \
plug-in-commands.obj \
qmask-actions.obj \
qmask-commands.obj \
sample-point-editor-actions.obj \
sample-point-editor-commands.obj \
select-actions.obj \
select-commands.obj \
templates-actions.obj \
......
......@@ -32,6 +32,7 @@ OBJECTS = \
pixel-processor.obj \
pixel-region.obj \
pixel-surround.obj \
segmentator.obj \
temp-buf.obj \
threshold.obj \
tile.obj \
......
......@@ -51,6 +51,7 @@ OBJECTS = \
gimpcontainer.obj \
gimpcontainer-filter.obj \
gimpcontext.obj \
gimpdashpattern.obj \
gimpdata.obj \
gimpdatafactory.obj \
gimp-documents.obj \
......@@ -62,6 +63,7 @@ OBJECTS = \
gimpdrawable-convert.obj \
gimpdrawable-desaturate.obj \
gimpdrawable-equalize.obj \
gimpdrawable-foreground-extract.obj \
gimpdrawable-histogram.obj \
gimpdrawable-invert.obj \
gimpdrawable-levels.obj \
......@@ -101,6 +103,7 @@ OBJECTS = \
gimpimagefile.obj \
gimpinterpreterdb.obj \
gimpitem.obj \
gimpitem-align.obj \
gimpitem-linked.obj \
gimpitem-preview.obj \
gimpitemundo.obj \
......
......@@ -552,7 +552,6 @@ EXPORTS
gimp_stroke_nearest_point_get
gimp_stroke_open
gimp_stroke_options_get_type
gimp_stroke_options_set_dash_preset
gimp_stroke_point_is_movable
gimp_stroke_point_move_absolute
gimp_stroke_translate
......@@ -749,3 +748,16 @@ gimp_buffer_new_from_pixbuf
gimp_container_is_empty
gimp_data_factory_data_refresh
gimp_layer_new_from_pixbuf
gimp_viewable_get_new_pixbuf
gimp_viewable_get_size
gimp_documents_save
gimp_container_clear
gimp_dash_pattern_free
gimp_dash_pattern_from_preset
gimp_dash_pattern_copy
gimp_dash_pattern_segments_set
gimp_dash_pattern_from_segments
gimp_item_align
gimp_stroke_options_set_dash_pattern
sort_boundary
......@@ -68,6 +68,7 @@ OBJECTS = \
pattern_cmds.obj \
patterns_cmds.obj \
plug_in_cmds.obj \
procedural-db-query.obj \
procedural_db_cmds.obj \
progress_cmds.obj \
selection_cmds.obj \
......
......@@ -27,6 +27,8 @@ PKG_LINK = \
OBJECTS = \
gimpairbrushtool.obj \
gimpaligntool.obj \
gimpalignoptions.obj \
gimpblendoptions.obj \
gimpblendtool.obj \
gimpbrightnesscontrasttool.obj \
......
......@@ -45,7 +45,8 @@
#include "gimpcontrollers.h"
#include "gimpdialogfactory.h"
#include "gimphelp-ids.h"
#include "gimpmessagedialog.c"
#include "gimpmessagebox.h"
#include "gimpmessagedialog.h"
#include "gimppropwidgets.h"
#include "gimpuimanager.h"
#include "gimpviewabledialog.h"
......
......@@ -36,6 +36,7 @@ OBJECTS = \
gimpbrushselect.obj \
gimpbufferview.obj \
gimpcellrendereraccel.obj \
gimpcellrendererdashes.obj \
gimpcellrendererviewable.obj \
gimpchanneltreeview.obj \
gimpclipboard.obj \
......@@ -60,6 +61,7 @@ OBJECTS = \
gimpcontrollereditor.obj \
gimpcontrollerinfo.obj \
gimpcontrollerkeyboard.obj \
gimpcontrollerlist.obj \
gimpcontrollerwheel.obj \
gimpcontrollers.obj \
gimpcursor.obj \
......@@ -102,6 +104,7 @@ OBJECTS = \
gimpimageview.obj \
gimpitemtreeview.obj \
gimplayertreeview.obj \
gimpmenudock.obj \
gimpmenufactory.obj \
gimpmessagebox.obj \
gimpmessagedialog.obj \
......
......@@ -24,6 +24,7 @@ OPTIMIZE = -Zi -MD
all : \
..\config.h \
gimpenums.c \
gimpuimarshal.c \
gimp-$(GIMP_VER).dll \
gimpui-$(GIMP_VER).dll
......@@ -89,6 +90,7 @@ gimp_OBJECTS = \
gimpchannel.obj \
gimpdrawable.obj \
gimpfontselect.obj \
gimpgimprc.obj \
gimpgradients.obj \
gimpgradientselect.obj \
gimpimage.obj \
......@@ -127,8 +129,10 @@ gimpenums.c: gimpenums.h gimpenums.c.tail
type gimpenums.c.tail >> xgen-cec
copy xgen-cec gimpenums.c
del xgen-cec
gimp-$(GIMP_VER).dll : $(gimp_OBJECTS) gimp.def
$(CC) $(CFLAGS) -LD -Fegimp-$(GIMP_VER).dll $(gimp_OBJECTS) $(DEPLIBS) \
..\libgimpconfig\gimpconfig-$(GIMP_VER).lib \
..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \
..\libgimpbase\gimpbase-$(GIMP_VER).lib \
$(LDFLAGS) user32.lib /def:gimp.def
......@@ -146,6 +150,7 @@ gimpui_OBJECTS = \
gimpexport.obj \
gimpfontmenu.obj \
gimpfontselect_pdb.obj \
gimpfontselectbutton.obj \
gimpgradientmenu.obj \
gimpimagecombobox.obj \
gimpmenu.obj \
......@@ -154,6 +159,14 @@ gimpui_OBJECTS = \
gimppixbuf.obj \
gimpprogressbar.obj \
gimpui.obj \
gimpuimarshal.obj \
gimpuimarshal.h : gimpuimarshal.list
$(GLIB)\gobject\glib-genmarshal --prefix=_gimpui_marshal gimpuimarshal.list --header >gimpuimarshal.h
gimpuimarshal.c : gimpuimarshal.list gimpuimarshal.h
$(GLIB)\gobject\glib-genmarshal --prefix=_gimpui_marshal gimpuimarshal.list --body >gimpuimarshal.c
gimpui-$(GIMP_VER).dll : $(gimpui_OBJECTS) gimpui.def
$(CC) $(CFLAGS) -LD -Fegimpui-$(GIMP_VER).dll $(gimpui_OBJECTS) \
......
......@@ -31,6 +31,7 @@ install : all
$(INSTALL) gimpmath-$(GIMP_VER).dll $(BIN)
OBJECTS = \
gimpbrowser.obj \
gimpbutton.obj \
gimpcellrenderercolor.obj \
gimpcellrenderertoggle.obj \
......@@ -49,6 +50,7 @@ OBJECTS = \
gimpcontroller.obj \
gimpdialog.obj \
gimpenumcombobox.obj \
gimpenumlabel.obj \
gimpenumstore.obj \
gimpenumwidgets.obj \
gimpfileentry.obj \
......@@ -59,6 +61,7 @@ OBJECTS = \
gimpmemsizeentry.obj \
gimpoffsetarea.obj \
gimpoldwidgets.obj \
gimppageselector.obj \
gimppatheditor.obj \
gimppickbutton.obj \
gimppixmap.obj \
......@@ -72,6 +75,7 @@ OBJECTS = \
gimpunitmenu.obj \
gimpwidgets.obj \
gimpwidgets-private.obj \
gimpwidgetsenums.obj \
gimpwidgetsmarshal.obj \
......
......@@ -37,6 +37,10 @@
#include <glib/gstdio.h>
#ifdef G_OS_WIN32
#include <io.h>
#endif
#include "libgimp/gimp.h"
#include "libgimp/gimpui.h"
......
......@@ -543,7 +543,7 @@ select_window_x11 (GdkScreen *screen)
#ifdef GDK_WINDOWING_WIN32
static GdkNativeWindow
select_window_x11 (GdkScreen *screen)
select_window_win32 (GdkScreen *screen)
{
/* MS Windows specific code goes here (yet to be written) */
......@@ -558,7 +558,7 @@ select_window_x11 (GdkScreen *screen)
#ifdef __GNUC__
#warning Win32 screenshot window chooser not implemented yet
#else
#pragma message "Win32 screenshot window chooser not implemented yet"
#pragma message("Win32 screenshot window chooser not implemented yet")
#endif
return 0;
......
......@@ -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 = 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 header hot illusion iwarp jigsaw jpeg laplace lic
COMMON4 = mapcolor max_rgb mblur mosaic newsprint nlfilt noisify normalize nova oilify papertile pat pcx pix pixelize plasma 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
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
COMMON4 = mapcolor max_rgb mblur mosaic neon newsprint nlfilt noisify normalize nova oilify papertile pat pcx photocopy pix pixelize plasma png pnm polar postscript psd psd_save psp randomize raw retinex ripple rotate
COMMON5 = sample_colorize scatter_hsv screenshot sel_gauss semiflatten sharpen shift sinus smooth_palette snoise sobel softglow sparkle spheredesigner spread struc sunras 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
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 maze mosaic pagecurl rcm sel2path sgi twain winicon winsnap xjt
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
# These are unofficial, ie not in the CVS. To build these, you should
# get tml's source snapshot and copy this makefile to the
......@@ -229,7 +229,7 @@ OBJECTS = \
!IFDEF EXTRA_dbbrowser
OBJECTS = \
gimpprocbox.obj \
# gimpprocbox.obj \
gimpprocbrowser.obj \
gimpprocview.obj \
procedure-browser.obj
......@@ -421,7 +421,6 @@ OBJECTS = \
imap_object.obj \
imap_object_popup.obj \
imap_polygon.obj \
imap_popup.obj \
imap_preferences.obj \
imap_preview.obj \
imap_rectangle.obj \
......@@ -432,8 +431,7 @@ OBJECTS = \
imap_stock.obj \
imap_string.obj \
imap_table.obj \
imap_toolbar.obj \
imap_tools.obj
imap_taglist.obj
# not changing the source which is lexed
EXTRACFLAGS = -FIstring.h -FIstdlib.h
!ENDIF
......@@ -445,6 +443,13 @@ OPTIMIZE =
!IFDEF EXTRA_jpeg
EXTRACFLAGS = -I$(JPEG)
EXTRALIBS = $(JPEG)\libjpeg.lib
OBJECTS = \
gimpexif.obj \
jpeg.obj \
jpeg-exif.obj \
jpeg-icc.obj \
jpeg-load.obj \
jpeg-save.obj
!ENDIF
!IFDEF EXTRA_maze
......@@ -621,12 +626,20 @@ OBJECTS = \
!IFDEF EXTRA_helpbrowser
OBJECTS = \
gimpthrobber.obj \
gimpthrobberaction.obj \
helpbrowser.obj \
dialog.obj \
queue.obj \
uri.obj
EXTRACFLAGS = $(GTKHTML2_CFLAGS)
EXTRALIBS = $(GTKHTML2_LIBS) user32.lib shell32.lib
dialog.c : logo-pixbuf.h
logo-pixbuf.h: wilber-reading.png
gdk-pixbuf-csource --raw --name=logo_data wilber-reading.png > logo-pixbuf.h
!ENDIF
!IFDEF EXTRA_guash
......@@ -677,7 +690,7 @@ EXTRALIBS = user32.lib
!ENDIF
!IFDEF EXTRA_webbrowser
EXTRALIBS = shell32.lib
EXTRALIBS = shell32.lib user32.lib
!ENDIF
!IFDEF EXTRA_winprint
......@@ -765,6 +778,7 @@ $(PLUGIN).exe : $(EXTRA_DEPS) $(OBJECTS) $(RESOURCE)
..\..\libgimp\gimp-$(GIMP_VER).lib ..\..\libgimp\gimpui-$(GIMP_VER).lib \
..\..\libgimpbase\gimpbase-$(GIMP_VER).lib \
..\..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \
..\..\libgimpconfig\gimpconfig-$(GIMP_VER).lib \
..\..\libgimpmath\gimpmath-$(GIMP_VER).lib \
..\..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
$(GLIB_LIBS) $(GTK2_LIBS) $(INTL_LIBS) $(EXTRALIBS) $(LDFLAGS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment