dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build menus with nmake, too menus/Makefile.am : added to EXTRA_DIST 

2005-04-24  Hans Breuer  <hans@breuer.org>

	* menus/makefile.msc : build menus with nmake, too
	  menus/Makefile.am : added to EXTRA_DIST

	* **/makefile.msc app/gimpcore.def : updated

	* app/base/tmp-buf.c : there is no pid_t with msvc so typedef one
This commit is contained in:
Hans Breuer 2005-04-24 15:39:15 +00:00 committed by Hans Breuer
parent be98e84fed
commit 28a2b13581
16 changed files with 125 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2005-04-24 Hans Breuer <hans@breuer.org>
* menus/makefile.msc : build menus with nmake, too
menus/Makefile.am : added to EXTRA_DIST
* **/makefile.msc app/gimpcore.def : updated
* app/base/tmp-buf.c : there is no pid_t with msvc so typedef one
2005-04-23 Sven Neumann <sven@gimp.org>
* libgimp/gimpdrawablepreview.c (gimp_drawable_preview_draw_thumb):

3
app/base/temp-buf.c
View File

@ -32,6 +32,9 @@
#ifdef G_OS_WIN32
#include <process.h> /* For _getpid() */
# ifdef _MSC_VER
typedef int pid_t;
# endif
#endif
#include "libgimpbase/gimpbase.h"

2
app/composite/makefile.msc
View File

@ -14,6 +14,7 @@ LT_RELEASE = $(PKG_VER)
OBJECTS = \
gimp-composite.obj \
gimp-composite-altivec.obj \
gimp-composite-generic.obj \
gimp-composite-generic-installer.obj \
gimp-composite-mmx.obj \
@ -33,6 +34,7 @@ mmx_sources = \
PKG_LINK = \
..\base\appbase.lib \
$(GLIB_LIBS) \
..\..\libgimpbase\gimpbase-$(PKG_VER).lib \
..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \
INCLUDES = \

3
app/core/makefile.msc
View File

@ -40,6 +40,7 @@ OBJECTS = \
gimp-units.obj \
gimparea.obj \
gimpbrush.obj \
gimpbrush-load.obj \
gimpbrushgenerated.obj \
gimpbrushpipe.obj \
gimpbuffer.obj \
@ -92,11 +93,13 @@ OBJECTS = \
gimpimage-qmask.obj \
gimpimage-resize.obj \
gimpimage-rotate.obj \
gimpimage-sample-points.obj \
gimpimage-snap.obj \
gimpimage-scale.obj \
gimpimage-undo.obj \
gimpimage-undo-push.obj \
gimpimagefile.obj \
gimpinterpreterdb.obj \
gimpitem.obj \
gimpitem-linked.obj \
gimpitem-preview.obj \

67
app/dialogs/makefile.msc
View File

@ -24,39 +24,40 @@ PKG_LINK = \
..\core\appcore-$(PKG_VER).lib \
OBJECTS = \
about-dialog.obj \
channel-options-dialog.obj \
convert-dialog.obj \
dialogs-constructors.obj \
dialogs.obj \
file-open-dialog.obj \
file-open-location-dialog.obj \
file-save-dialog.obj \
grid-dialog.obj \
image-merge-layers-dialog.obj \
image-new-dialog.obj \
image-scale-dialog.obj \
info-dialog.obj \
info-window.obj \
layer-add-mask-dialog.obj \
layer-options-dialog.obj \
module-dialog.obj \
offset-dialog.obj \
palette-import-dialog.obj \
preferences-dialog.obj \
print-size-dialog.obj \
quit-dialog.obj \
resize-dialog.obj \
resolution-calibrate-dialog.obj \
scale-dialog.obj \
stroke-dialog.obj \
template-options-dialog.obj \
tips-dialog.obj \
tips-parser.obj \
user-install-dialog.obj \
vectors-export-dialog.obj \
vectors-import-dialog.obj \
vectors-options-dialog.obj \
about-dialog.obj \
channel-options-dialog.obj \
convert-dialog.obj \
desaturate-dialog.obj \
dialogs-constructors.obj \
dialogs.obj \
file-open-dialog.obj \
file-open-location-dialog.obj \
file-save-dialog.obj \
grid-dialog.obj \
image-merge-layers-dialog.obj \
image-new-dialog.obj \
image-properties-dialog.obj \
image-scale-dialog.obj \
info-dialog.obj \
layer-add-mask-dialog.obj \
layer-options-dialog.obj \
module-dialog.obj \
offset-dialog.obj \
palette-import-dialog.obj \
preferences-dialog.obj \
print-size-dialog.obj \
quit-dialog.obj \
resize-dialog.obj \
resolution-calibrate-dialog.obj \
scale-dialog.obj \
stroke-dialog.obj \
template-options-dialog.obj \
tips-dialog.obj \
tips-parser.obj \
user-install-dialog.obj \
vectors-export-dialog.obj \
vectors-import-dialog.obj \
vectors-options-dialog.obj \
all : \
$(PRJ_TOP)\config.h \

18
app/gimpcore.def
View File

@ -466,6 +466,7 @@ EXPORTS
gimp_marshal_VOID__INT
gimp_marshal_VOID__INT_INT
gimp_marshal_VOID__OBJECT
gimp_marshal_VOID__OBJECT_OBJECT
gimp_marshal_VOID__OBJECT_POINTER
gimp_marshal_VOID__POINTER
gimp_marshal_VOID__STRING
@ -497,7 +498,6 @@ EXPORTS
gimp_palette_import_from_gradient
gimp_palette_import_from_image
gimp_palette_import_from_indexed_image
gimp_palette_set_n_columns
gimp_param_memsize_get_type
gimp_param_rgb_get_type
gimp_param_spec_rgb
@ -733,3 +733,19 @@ gimp_image_get_channel_index
gimp_image_get_save_proc
gimp_lut_process
gimp_progress_pulse
gimp_image_find_sample_point
gimp_image_move_sample_point
gimp_image_remove_sample_point
gimp_image_sample_point_ref
gimp_image_sample_point_unref
gimp_image_add_sample_point_at_pos
gimp_gradient_segment_split_midpoint
gimp_image_resize_layers_get_type
gimp_image_resize_with_layers
gimp_image_update_sample_point
gimp_palette_set_columns
gimp_vectors_warp_vectors
gimp_buffer_new_from_pixbuf
gimp_container_is_empty
gimp_data_factory_data_refresh
gimp_layer_new_from_pixbuf

1
app/pdb/makefile.msc
View File

@ -76,6 +76,7 @@ OBJECTS = \
transform_tools_cmds.obj \
undo_cmds.obj \
unit_cmds.obj \
vectors_cmds.obj \
INCLUDES = \
-FImsvc_recommended_pragmas.h \

1
app/plug-in/makefile.msc
View File

@ -26,6 +26,7 @@ OBJECTS = \
plug-in-proc-def.obj \
plug-in-proc-frame.obj \
plug-in-progress.obj \
plug-ins-query.obj \
plug-in-rc.obj \
plug-in-run.obj \
plug-in-shm.obj \

2
app/tools/makefile.msc
View File

@ -74,6 +74,8 @@ OBJECTS = \
gimppenciltool.obj \
gimpperspectivetool.obj \
gimpposterizetool.obj \
gimprectangleoptions.obj \
gimprectangletool.obj \
gimprectselecttool.obj \
gimprotatetool.obj \
gimpscaletool.obj \

1
app/vectors/makefile.msc
View File

@ -34,6 +34,7 @@ OBJECTS = \
gimpvectors.obj \
gimpvectors-compat.obj \
gimpvectors-preview.obj \
gimpvectors-warp.obj \
all : \
$(PRJ_TOP)\config.h \

6
app/widgets/makefile.msc
View File

@ -63,6 +63,7 @@ OBJECTS = \
gimpcontrollerwheel.obj \
gimpcontrollers.obj \
gimpcursor.obj \
gimpcursorview.obj \
gimpdasheditor.obj \
gimpdataeditor.obj \
gimpdatafactoryview.obj \
@ -71,6 +72,7 @@ OBJECTS = \
gimpdevicestatus.obj \
gimpdialogfactory.obj \
gimpdnd.obj \
gimpdnd-xds.obj \
gimpdock.obj \
gimpdockable.obj \
gimpdockbook.obj \
@ -82,6 +84,7 @@ OBJECTS = \
gimperrorconsole.obj \
gimperrordialog.obj \
gimpfgbgeditor.obj \
gimpfgbgview.obj \
gimpfiledialog.obj \
gimpfileprocview.obj \
gimpfontview.obj \
@ -95,6 +98,7 @@ OBJECTS = \
gimphistogramview.obj \
gimpimagedock.obj \
gimpimageeditor.obj \
gimpimagepropview.obj \
gimpimageview.obj \
gimpitemtreeview.obj \
gimplayertreeview.obj \
@ -107,10 +111,12 @@ OBJECTS = \
gimppatternfactoryview.obj \
gimppatternselect.obj \
gimppdbdialog.obj \
gimppixbuf.obj \
gimppluginaction.obj \
gimpprogressbox.obj \
gimpprogressdialog.obj \
gimppropwidgets.obj \
gimpsamplepointeditor.obj \
gimpselectiondata.obj \
gimpselectioneditor.obj \
gimpsessioninfo.obj \

2
libgimpthumb/makefile.msc
View File

@ -16,7 +16,7 @@ INCLUDES = -I.. $(GDK_PIXBUF_CFLAGS)
# DEFINES = -DG_LOG_DOMAIN=\"LibGimpThump\"
DEPCFLAGS = \
-FImsvc_recommended_pragmas.h \
$(GLIB_CFLAGS)
$(GLIB_CFLAGS) $(GTK2_CFLAGS)
DEPLIBS = $(GLIB_LIBS) $(GDK_PIXBUF_LIBS) $(INTL_LIBS) \
..\libgimpbase\gimpbase-$(GIMP_VER).lib \

3
menus/Makefile.am
View File

@ -38,7 +38,8 @@ EXTRA_DIST = \
$(menudata_in_files) \
dialogs-menuitems.xml \
gtkuimanager.dtd \
menus.xsl
menus.xsl \
makefile.msc
MAINTAINERCLEAN_FILES = $(menudata_built_files)

34
menus/makefile.msc Normal file
View File

@ -0,0 +1,34 @@
!IFNDEF XSLTPROC
XSLTPROC = xsltproc
!ENDIF
menudata_in_files = \
dockable-menu.xml.in \
image-menu.xml.in \
toolbox-menu.xml.in
menudata_built_files = $(menudata_in_files:.xml.in=.xml)
MENUS = dockable image toolbox
_MENUS = \
brushes buffers channels colormap-editor documents \
error-console file-open file-save fonts \
gradient-editor gradients \
images layers \
palette-editor palettes patterns qmask \
templates tool vectors
EXTRA_DIST = \
$(menudata_DATA) \
$(menudata_in_files) \
dialogs-menuitems.xml \
gtkuimanager.dtd \
menus.xsl
sub-menus : makefile.msc
for %d in ($(MENUS)) do $(XSLTPROC) -o %d-menu.xml --xinclude menus.xsl %d-menu.xml.in
all : \
sub-menus

10
plug-ins/makefile.msc
View File

@ -489,8 +489,8 @@ EXTRA_DEPS = pagecurl-icons.h
!ENDIF
!IFDEF EXTRA_png
EXTRACFLAGS = -I$(PNG) -I$(ZLIB)
EXTRALIBS = $(PNG)\libpng.lib $(ZLIB)\zlib.lib
EXTRACFLAGS = $(PNG_CFLAGS)
EXTRALIBS = $(PNG_LIBS)
!ENDIF
!IFDEF EXTRA_print
@ -503,8 +503,8 @@ OBJECTS = \
!ENDIF
!IFDEF EXTRA_psp
EXTRACFLAGS = -I$(ZLIB)
EXTRALIBS = $(ZLIB)\zlib.lib user32.lib
EXTRACFLAGS = $(ZLIB_CFLAGS)
EXTRALIBS = $(ZLIB_LIBS)
!ENDIF
!IFDEF EXTRA_rcm
@ -578,7 +578,7 @@ EXTRALIBS = $(RSVG_LIBS)
!IFDEF EXTRA_tiff
EXTRACFLAGS = -I$(TIFF)
EXTRALIBS = $(TIFF)\libtiff.lib $(JPEG)\libjpeg.lib $(ZLIB)\zlib.lib user32.lib
EXTRALIBS = $(TIFF)\libtiff.lib $(JPEG)\libjpeg.lib $(ZLIB_LIBS) user32.lib
!ENDIF
!IFDEF EXTRA_gimp_ace

4
themes/Default/images/makefile.msc
View File

@ -48,6 +48,8 @@ STOCK_VARIABLES = \
stock_convert_grayscale_16 stock-convert-grayscale-16.png \
stock_convert_indexed_16 stock-convert-indexed-16.png \
stock_convert_rgb_16 stock-convert-rgb-16.png \
stock_cursor_16 stock-cursor-16.png \
stock_cursor_24 stock-cursor-24.png \
stock_curve_free_16 stock-curve-free-16.png \
stock_curve_smooth_16 stock-curve-smooth-16.png \
stock_default_colors_12 stock-default-colors-12.png \
@ -151,6 +153,8 @@ STOCK_VARIABLES = \
stock_rotate_180_16 stock-rotate-180-16.png \
stock_rotate_270_16 stock-rotate-270-16.png \
stock_rotate_90_16 stock-rotate-90-16.png \
stock_sample_point_16 stock-sample-point-16.png \
stock_sample_point_24 stock-sample-point-24.png \
stock_scale_16 stock-scale-16.png \
stock_selection_16 stock-selection-16.png \
stock_selection_add_16 stock-selection-add-16.png \