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

app/text/makefile.msc (new file) */makefile.msc */*/makefile.msc : updated 

2003-03-03  Hans Breuer  <hans@breuer.org>

	* app/text/makefile.msc (new file)
	  */makefile.msc */*/makefile.msc : updated

	* app/core/gimpdata.c : define access() constants
	for G_OS_WIN32 case

	* app/text/gimptext.c : <stdlib.h> for getenv()

	* libgimp/gimp.def libgimp/gimpui.def : updated externals

	* libgimpwidgets/libgimp-glue.c : make dynamic_resolve
	actually work again for 'my' DLL naming convention

	* plug-ins/gap/gap_pdb_calls.c : reflect renaming
	of GIMP_VERTICAL to GIMP_ORIENTATION_VERTICAL
This commit is contained in:
Hans Breuer 2003-03-03 18:14:31 +00:00 committed by Hans Breuer
parent 6bfa4f54a0
commit 594bccd558
21 changed files with 214 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@ -1,3 +1,21 @@
2003-03-03 Hans Breuer <hans@breuer.org>
* app/text/makefile.msc (new file)
*/makefile.msc */*/makefile.msc : updated
* app/core/gimpdata.c : define access() constants
for G_OS_WIN32 case
* app/text/gimptext.c : <stdlib.h> for getenv()
* libgimp/gimp.def libgimp/gimpui.def : updated externals
* libgimpwidgets/libgimp-glue.c : make dynamic_resolve
actually work again for 'my' DLL naming convention
* plug-ins/gap/gap_pdb_calls.c : reflect renaming
of GIMP_VERTICAL to GIMP_ORIENTATION_VERTICAL
2003-03-03 Michael Natterer <mitch@gimp.org>
* app/widgets/gimppreviewrenderer.[ch]: made the default buffer

9
app/core/gimpdata.c
View File

@ -31,6 +31,15 @@
#include <glib-object.h>
#ifdef G_OS_WIN32
#include <io.h>
#define F_OK 0
#define W_OK 2
#define R_OK 4
#define X_OK 0 /* not really */
#define access(f,p) _access(f,p)
#endif
#include "libgimpbase/gimpbase.h"
#include "core-types.h"

5
app/core/makefile.msc
View File

@ -76,8 +76,8 @@ OBJECTS = \
gimpimage-qmask.obj \
gimpimage-resize.obj \
gimpimage-scale.obj \
gimpimage-text.obj \
gimpimage-undo.obj \
gimpimage-undo-push.obj \
gimpimagefile.obj \
gimpitem.obj \
gimplayer.obj \
@ -95,7 +95,6 @@ OBJECTS = \
gimppattern.obj \
gimppreviewcache.obj \
gimpscanconvert.obj \
gimptext.obj \
gimptoolinfo.obj \
gimpundo.obj \
gimpundostack.obj \
@ -119,7 +118,7 @@ INCLUDES = \
-FImsvc_recommended_pragmas.h \
-I$(PRJ_TOP) \
-I$(PRJ_TOP)/app \
$(GTK2_CFLAGS) $(FREETYPE2_CFLAGS) \
$(GTK2_CFLAGS) \
$(LIBART_CFLAGS) \
DEFINES = \

3
app/display/makefile.msc
View File

@ -27,6 +27,7 @@ OBJECTS = \
gimpdisplay-handlers.obj \
gimpdisplayshell.obj \
gimpdisplayshell-callbacks.obj \
gimpdisplayshell-cursor.obj \
gimpdisplayshell-dnd.obj \
gimpdisplayshell-filter.obj \
gimpdisplayshell-filter-dialog.obj \
@ -36,6 +37,8 @@ OBJECTS = \
gimpdisplayshell-scale.obj \
gimpdisplayshell-scroll.obj \
gimpdisplayshell-selection.obj \
gimpdisplayshell-title.obj \
gimpdisplayshell-transform.obj \
gimpnavigationview.obj \
gimpprogress.obj \
gimpstatusbar.obj \

22
app/gui/makefile.msc
View File

@ -26,20 +26,26 @@ PKG_LINK = \
OBJECTS = \
about-dialog.obj \
brushes-commands.obj \
brushes-menu.obj \
brush-select.obj \
buffers-commands.obj \
buffers-menu.obj \
channels-commands.obj \
channels-menu.obj \
colormap-editor-commands.obj \
colormap-editor-menu.obj \
color-history.obj \
color-notebook.obj \
convert-dialog.obj \
data-commands.obj \
debug-commands.obj \
device-status-dialog.obj \
dialogs.obj \
dialogs-commands.obj \
dialogs-menu.obj \
dialogs-constructors.obj \
documents-commands.obj \
documents-menu.obj \
drawable-commands.obj \
edit-commands.obj \
error-console-dialog.obj \
@ -47,31 +53,41 @@ OBJECTS = \
file-dialog-utils.obj \
file-new-dialog.obj \
file-open-dialog.obj \
file-open-menu.obj \
file-save-dialog.obj \
file-save-menu.obj \
gradient-editor-commands.obj \
gradient-editor-menu.obj \
gradients-commands.obj \
gradients-menu.obj \
gradient-select.obj \
gui.obj \
help-commands.obj \
image-commands.obj \
image-menu.obj \
images-commands.obj \
images-menu.obj \
info-dialog.obj \
info-window.obj \
layers-commands.obj \
layers-menu.obj \
menus.obj \
module-browser.obj \
offset-dialog.obj \
palette-editor-commands.obj \
palette-editor-menu.obj \
palette-import-dialog.obj \
palettes-commands.obj \
palettes-menu.obj \
palette-select.obj \
paths-dialog.obj \
patterns-commands.obj \
patterns-menu.obj \
pattern-select.obj \
plug-in-commands.obj \
plug-in-menus.obj \
preferences-dialog.obj \
qmask-commands.obj \
qmask-menu.obj \
resize-dialog.obj \
resolution-calibrate-dialog.obj \
select-commands.obj \
@ -81,9 +97,11 @@ OBJECTS = \
tips-dialog.obj \
tips-parser.obj \
tool-options-dialog.obj \
toolbox-menu.obj \
tools-commands.obj \
user-install-dialog.obj \
vectors-commands.obj \
vectors-menu.obj \
view-commands.obj \

7
app/makefile.msc
View File

@ -11,7 +11,7 @@ top_srcdir = $(PRJ_TOP)
top_builddir = $(PRJ_TOP)
includedir = $(PRJ_TOP)
LT_RELEASE = $(PKG_VER)
SUBDIRS = paint-funcs base config xcf core file \
SUBDIRS = paint-funcs base config xcf core file text \
display paint vectors pdb plug-in tools widgets gui
sub-all:
@ -31,6 +31,7 @@ PKG_LINK = \
plug-in/appplug-in.lib \
pdb/apppdb.lib \
tools/apptools.lib \
text/apptext.lib \
gui/appgui.lib \
widgets/appwidgets.lib \
core/appcore.lib \
@ -75,11 +76,7 @@ mmx_sources = \
OBJECTS = \
ops_buttons.obj \
undo_history.obj \
path.obj \
path_curves.obj \
path_bezier.obj \
undo.obj \
app_procs.obj \
main.obj \
batch.obj \

7
app/paint/makefile.msc
View File

@ -24,16 +24,23 @@ PKG_LINK = \
OBJECTS = \
gimpairbrush.obj \
gimpairbrushoptions.obj \
gimpclone.obj \
gimpcloneoptions.obj \
gimpconvolve.obj \
gimpconvolveoptions.obj \
gimpdodgeburn.obj \
gimpdodgeburnoptions.obj \
gimperaser.obj \
gimperaseroptions.obj \
gimppaintbrush.obj \
gimppaintcore.obj \
gimppaintcore-stroke.obj \
gimppaintcore-undo.obj \
gimppaintoptions.obj \
gimppencil.obj \
gimpsmudge.obj \
gimpsmudgeoptions.obj \
paint.obj \
paint-enums.obj \

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

@ -15,11 +15,15 @@ PKG_LINK = \
OBJECTS = \
plug-in.obj \
plug-in-debug.obj \
plug-in-def.obj \
plug-in-message.obj \
plug-in-params.obj \
plug-in-proc.obj \
plug-in-progress.obj \
plug-in-rc.obj \
plug-in-run.obj \
plug-in-shm.obj \
plug-ins.obj \
INCLUDES = \

1
app/text/gimptext.c
View File

@ -21,6 +21,7 @@
#include "config.h"
#include <stdlib.h>
#include <string.h>
#include <glib-object.h>

52
app/text/makefile.msc Normal file
View File

@ -0,0 +1,52 @@
# autogenerated from automake.am with automake.py
TOP = ..\..\..
PRJ_TOP = ..\..
PACKAGE = apptext
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc
PKG_LINK = \
$(GLIB_LIBS) $(PANGOFT2_LIBS) \
..\config\appconfig-$(PKG_VER).lib \
..\base\appbase-$(PKG_VER).lib \
..\..\libgimpbase\gimpbase-$(PKG_VER).lib \
\
..\core\appcore-$(PKG_VER).lib
OBJECTS = \
gimptext.obj \
gimptext-compat.obj \
gimptextlayer.obj \
gimptextlayout.obj \
text-enums.obj \
INCLUDES = \
-FImsvc_recommended_pragmas.h \
-I$(PRJ_TOP) \
-I$(PRJ_TOP)/app \
$(GLIB_CFLAGS) $(PANGO_CFLAGS) $(GTK2_CFLAGS) $(FREETYPE2_CFLAGS) \
all : \
$(PRJ_TOP)\config.h \
$(PACKAGE).lib \
!IFDEF DLLGIMP
$(PACKAGE)-$(PKG_VER).dll
!ENDIF
$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
RESOURCE = $(PACKAGE).res
$(PACKAGE).lib : $(OBJECTS)
lib /out:$(PACKAGE).lib $(OBJECTS)
$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def
$(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def
$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
$(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \
user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
.c.obj :
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<

18
app/tools/makefile.msc
View File

@ -27,14 +27,18 @@ OBJECTS = \
tools.obj \
gimpairbrushtool.obj \
gimpbezierselecttool.obj \
gimpblendoptions.obj \
gimpblendtool.obj \
gimpbrightnesscontrasttool.obj \
gimpbucketfilloptions.obj \
gimpbucketfilltool.obj \
gimpbycolorselecttool.obj \
gimpclonetool.obj \
gimpcolorbalancetool.obj \
gimpcolorpickeroptions.obj \
gimpcolorpickertool.obj \
gimpconvolvetool.obj \
gimpcropoptions.obj \
gimpcroptool.obj \
gimpcurvestool.obj \
gimpdodgeburntool.obj \
@ -42,44 +46,50 @@ OBJECTS = \
gimpeditselectiontool.obj \
gimpellipseselecttool.obj \
gimperasertool.obj \
gimpflipoptions.obj \
gimpfliptool.obj \
gimpfreeselecttool.obj \
gimpfuzzyselecttool.obj \
gimphistogramtool.obj \
gimphuesaturationtool.obj \
gimpimagemaptool.obj \
gimpinkoptions.obj \
gimpinktool.obj \
gimpinktool-blob.obj \
gimpiscissorstool.obj \
gimplevelstool.obj \
gimpmagnifyoptions.obj \
gimpmagnifytool.obj \
gimpmeasureoptions.obj \
gimpmeasuretool.obj \
gimpmoveoptions.obj \
gimpmovetool.obj \
gimppaintbrushtool.obj \
gimppainttool.obj \
gimppathtool.obj \
gimppenciltool.obj \
gimpperspectivetool.obj \
gimpposterizetool.obj \
gimprectselecttool.obj \
gimprotatetool.obj \
gimpscaletool.obj \
gimpselectionoptions.obj \
gimpselectiontool.obj \
gimpsheartool.obj \
gimpsmudgetool.obj \
gimptextoptions.obj \
gimptexttool.obj \
gimpthresholdtool.obj \
gimptool.obj \
gimptoolcontrol.obj \
gimptoolmodule.obj \
gimptransformoptions.obj \
gimptransformtool.obj \
gimptransformtool-undo.obj \
gimpvectoroptions.obj \
gimpvectortool.obj \
transform_options.obj \
paint_options.obj \
selection_options.obj \
tool_options.obj \
tool_manager.obj \
path_tool.obj \
INCLUDES = \
-FImsvc_recommended_pragmas.h \

27
app/widgets/makefile.msc
View File

@ -25,9 +25,8 @@ PKG_LINK = \
OBJECTS = \
gimpbrusheditor.obj \
gimpbrushfactoryview.obj \
gimpbrushpreview.obj \
gimpbufferpreview.obj \
gimpbufferview.obj \
gimpcellrendererviewable.obj \
gimpchannellistitem.obj \
gimpchannellistview.obj \
gimpcoloreditor.obj \
@ -39,14 +38,15 @@ OBJECTS = \
gimpcontainerlistview.obj \
gimpcontainermenu.obj \
gimpcontainermenuimpl.obj \
gimpcontainertreeview.obj \
gimpcontainerview.obj \
gimpcontainerview-utils.obj \
gimpcursor.obj \
gimpdataeditor.obj \
gimpdatafactoryview.obj \
gimpdialogfactory.obj \
gimpdeviceinfo.obj \
gimpdevices.obj \
gimpdialogfactory.obj \
gimpdnd.obj \
gimpdock.obj \
gimpdockable.obj \
@ -54,19 +54,16 @@ OBJECTS = \
gimpdocumentview.obj \
gimpdrawablelistitem.obj \
gimpdrawablelistview.obj \
gimpdrawablepreview.obj \
gimpeditor.obj \
gimpenummenu.obj \
gimpfontselection.obj \
gimpfontselection-dialog.obj \
gimpgradienteditor.obj \
gimpgradientpreview.obj \
gimphelp.obj \
gimphistogrambox.obj \
gimphistogramview.obj \
gimpimagedock.obj \
gimpimagefilepreview.obj \
gimpimagepreview.obj \
gimpimageeditor.obj \
gimpimageview.obj \
gimpitemfactory.obj \
gimpitemlistitem.obj \
@ -74,28 +71,32 @@ OBJECTS = \
gimplayerlistitem.obj \
gimplayerlistview.obj \
gimplistitem.obj \
gimpmenufactory.obj \
gimpmenuitem.obj \
gimpnavigationpreview.obj \
gimppaletteeditor.obj \
gimppalettepreview.obj \
gimppatternpreview.obj \
gimppreview.obj \
gimppreview-utils.obj \
gimppreview-popup.obj \
gimppreviewrenderer.obj \
gimppreviewrendererbrush.obj \
gimppreviewrendererdrawable.obj \
gimppreviewrendererimage.obj \
gimppreviewrenderer-utils.obj \
gimppropwidgets.obj \
gimpselectioneditor.obj \
gimptexteditor.obj \
gimptoolbox.obj \
gimptoolbox-color-area.obj \
gimptoolbox-indicator-area.obj \
gimptoolinfopreview.obj \
gimpundoeditor.obj \
gimpvectorslistview.obj \
gimpviewabledialog.obj \
gimpwidgets-constructors.obj \
gimpwidgets-utils.obj \
gtkwrapbox.obj \
gtkhwrapbox.obj \
gtkvwrapbox.obj \
gtkwrapbox.obj \
widgets-enums.obj \
# gimpconstrainedhwrapbox.obj \
INCLUDES = \
-FImsvc_recommended_pragmas.h \

2
libgimp/gimp.def
View File

@ -266,7 +266,9 @@ EXPORTS
gimp_pixel_fetcher_get_pixel
gimp_pixel_fetcher_get_pixel2
gimp_pixel_fetcher_new
gimp_pixel_fetcher_put_pixel
gimp_pixel_fetcher_set_bg_color
gimp_pixel_fetcher_set_shadow
gimp_pixel_rgn_get_col
gimp_pixel_rgn_get_pixel
gimp_pixel_rgn_get_rect

5
libgimp/gimpui.def
View File

@ -7,9 +7,14 @@ EXPORTS
gimp_export_image
gimp_fixme_preview_do_row
gimp_fixme_preview_fill
gimp_fixme_preview_fill_scaled
gimp_fixme_preview_fill_with_thumb
gimp_fixme_preview_free
gimp_fixme_preview_get_pixel
gimp_fixme_preview_new
gimp_fixme_preview_new2
gimp_fixme_preview_put_pixel
gimp_fixme_preview_update
gimp_gradient_select_widget
gimp_gradient_select_widget_close_popup
gimp_gradient_select_widget_set_popup

1
libgimp/makefile.msc
View File

@ -124,6 +124,7 @@ gimpui_OBJECTS = \
gimpmenu.obj \
gimppatternmenu.obj \
gimpexport.obj \
gimpmiscui.obj \
# gimppatheditor.obj \
gimpui-$(GIMP_VER).dll : $(gimpui_OBJECTS) gimpui.def

1
libgimpbase/makefile.msc
View File

@ -34,6 +34,7 @@ OBJECTS = \
gimpparasite.obj \
gimpparasiteio.obj \
gimpprotocol.obj \
gimputils.obj \
gimpwire.obj \
lib_LTLIBRARIES = \

2
libgimpwidgets/libgimp-glue.c
View File

@ -83,7 +83,7 @@ dynamic_resolve (const gchar* name, HMODULE* hMod)
*hMod = LoadLibrary ("libgimp-" LT_RELEASE "-" LT_CURRENT_MINUS_AGE ".dll");
#endif
/* If that didn't work, try the name style used by Hans Breuer */
if (!hMod)
if (!*hMod)
*hMod = LoadLibrary ("gimp-1.3.dll");
fn = GetProcAddress (*hMod, name);
}

1
libgimpwidgets/makefile.msc
View File

@ -50,6 +50,7 @@ OBJECTS = \
gimpdialog.obj \
gimpfileselection.obj \
gimphelpui.obj \
gimpmemsizeentry.obj \
gimpoffsetarea.obj \
gimppatheditor.obj \
gimppickbutton.obj \

2
plug-ins/gap/gap_pdb_calls.c
View File

@ -329,7 +329,7 @@ gint32 p_gimp_image_add_guide(gint32 image_id, gint32 position, gint32 orienta
GimpParam *return_vals;
int nreturn_vals;
if (orientation == GIMP_VERTICAL)
if (orientation == GIMP_ORIENTATION_VERTICAL)
{
l_add_guide_proc = "gimp_image_add_vguide";
}

43
plug-ins/makefile.msc
View File

@ -297,6 +297,47 @@ OBJECTS = \
gfli.obj
!ENDIF
!IFDEF EXTRA_gfig
STOCK_VARS = \
stock_bezier images/stock-bezier.png \
stock_circle images/stock-circle.png \
stock_copy_object images/stock-copy-object.png \
stock_curve images/stock-curve.png \
stock_delete_object images/stock-delete-object.png \
stock_ellipse images/stock-ellipse.png \
stock_line images/stock-line.png \
stock_move_object images/stock-move-object.png \
stock_move_point images/stock-move-point.png \
stock_polygon images/stock-polygon.png \
stock_spiral images/stock-spiral.png \
stock_star images/stock-star.png \
stock_logo images/stock-logo.png
STOCK_IMAGES = \
images/stock-bezier.png \
images/stock-circle.png \
images/stock-copy-object.png \
images/stock-curve.png \
images/stock-delete-object.png \
images/stock-ellipse.png \
images/stock-line.png \
images/stock-move-object.png \
images/stock-move-point.png \
images/stock-polygon.png \
images/stock-spiral.png \
images/stock-star.png \
images/stock-logo.png
images/gfig-stock-pixbufs.h: $(STOCK_IMAGES)
gdk-pixbuf-csource --rle --build-list $(STOCK_VARS) > images/gfig-stock-pixbufs.h
EXTRA_DEPS = images/gfig-stock-pixbufs.h
OBJECTS = \
gfig.obj \
gfig-stock.obj
!ENDIF
!IFDEF EXTRA_ifscompose
OBJECTS = \
ifscompose.obj \
@ -612,7 +653,7 @@ RESOURCE = $(PLUGIN).res
RESOURCE = ..\..\app\gimp.res
!ENDIF
$(PLUGIN).exe : $(OBJECTS) $(RESOURCE)
$(PLUGIN).exe : $(EXTRA_DEPS) $(OBJECTS) $(RESOURCE)
$(CC) $(CFLAGS) -Fe$(PLUGIN).exe $(OBJECTS) $(RESOURCE) \
..\..\libgimp\gimp-$(GIMP_VER).lib ..\..\libgimp\gimpui-$(GIMP_VER).lib \
..\..\libgimpbase\gimpbase-$(GIMP_VER).lib \

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

@ -50,6 +50,14 @@ STOCK_VARIABLES = \
stock_edit_16 stock-edit-16.png \
stock_error_64 stock-error-64.png \
stock_eye_20 stock-eye-20.png \
stock_gravity_east_24 stock-gravity-east-24.png \
stock_gravity_north_24 stock-gravity-north-24.png \
stock_gravity_north_east_24 stock-gravity-north-east-24.png \
stock_gravity_north_west_24 stock-gravity-north-west-24.png \
stock_gravity_south_24 stock-gravity-south-24.png \
stock_gravity_south_east_24 stock-gravity-south-east-24.png \
stock_gravity_south_west_24 stock-gravity-south-west-24.png \
stock_gravity_west_24 stock-gravity-west-24.png \
stock_grow_16 stock-grow-16.png \
stock_hchain_24 stock-hchain-24.png \
stock_hchain_broken_24 stock-hchain-broken-24.png \
@ -98,8 +106,12 @@ STOCK_VARIABLES = \
stock_rotate_90_16 stock-rotate-90-16.png \
stock_scale_16 stock-scale-16.png \
stock_selection_add_16 stock-selection-add-16.png \
stock_selection_all_16 stock-selection-all-16.png \
stock_selection_grow_16 stock-selection-grow-16.png \
stock_selection_intersect_16 stock-selection-intersect-16.png \
stock_selection_none_16 stock-selection-none-16.png \
stock_selection_replace_16 stock-selection-replace-16.png \
stock_selection_shrink_16 stock-selection-shrink-16.png \
stock_selection_stroke_16 stock-selection-stroke-16.png \
stock_selection_subtract_16 stock-selection-subtract-16.png \
stock_selection_to_channel_16 stock-selection-to-channel-16.png \
@ -113,6 +125,7 @@ STOCK_VARIABLES = \
stock_warning_24 stock-warning-24.png \
stock_warning_64 stock-warning-64.png \
stock_wilber_eek_64 stock-wilber-eek-64.png \
stock_wilber_64 stock-wilber-64.png \
stock_wilber_16 stock-wilber-16.png \
STOCK_TOOL_VARIABLES = \