Commit 39dbecb7 authored by Hans Breuer's avatar Hans Breuer Committed by Hans Breuer

define HAVE_DIRENT_H, it's from build/win32/dirent

2001-10-28  Hans Breuer  <hans@breuer.org>

	* config.h.win32 : define HAVE_DIRENT_H, it's from build/win32/dirent

	* app/*/makefile.msc : updated
	* app/file/makefile.msc app/display/makefile.msc : new files

	* app/user_install.c : make the G_OS_WIN32 part compile again (fn -> filename)

	* app/core/gimptoolinfo.c (gimp_tool_info_init) : cosmetic change,
	make implementation signature static like the local prototype

	* app/pdb/gradients_cmds.c app/pdb/palette_cmds.c : include <string.h>
	for strlen () / strcmp () by ...
	* tools/pdbgen/pdb/gradients.pdb tools/pdbgen/pdb/palette.pdb :
	... changing the perl source here

	* app/widgets/gimpdocumentview.c : #include <string.h>

	* libgimp/makefile.msc :
	* libgimpwidgets/gimpwidgets.def : updated

	* plug-ins/makefile.msc : reflect the fact that DIRENT functions
	are removed from glib. Also define the questionable GETTEXT_PACKAGE
	and LOCALEDIR which are required to compile, not adapted to NLS
	support for win32 yet
parent 6d4e0509
2001-10-28 Hans Breuer <hans@breuer.org>
* config.h.win32 : define HAVE_DIRENT_H, it's from build/win32/dirent
* app/*/makefile.msc : updated
* app/file/makefile.msc app/display/makefile.msc : new files
* app/user_install.c : make the G_OS_WIN32 part compile again (fn -> filename)
* app/core/gimptoolinfo.c (gimp_tool_info_init) : cosmetic change,
make implementation signature static like the local prototype
* app/pdb/gradients_cmds.c app/pdb/palette_cmds.c : include <string.h>
for strlen () / strcmp () by ...
* tools/pdbgen/pdb/gradients.pdb tools/pdbgen/pdb/palette.pdb :
... changing the perl source here
* app/widgets/gimpdocumentview.c : #include <string.h>
* libgimp/makefile.msc :
* libgimpwidgets/gimpwidgets.def : updated
* plug-ins/makefile.msc : reflect the fact that DIRENT functions
are removed from glib. Also define the questionable GETTEXT_PACKAGE
and LOCALEDIR which are required to compile, not adapted to NLS
support for win32 yet
2001-10-28 Sven Neumann <sven@gimp.org> 2001-10-28 Sven Neumann <sven@gimp.org>
* plug-ins/common/nlfilt.c * plug-ins/common/nlfilt.c
......
...@@ -7,13 +7,8 @@ PACKAGE = appbase ...@@ -7,13 +7,8 @@ PACKAGE = appbase
PKG_VER = 1.3 PKG_VER = 1.3
!INCLUDE $(TOP)\build\win32\make.msc !INCLUDE $(TOP)\build\win32\make.msc
top_srcdir = $(PRJ_TOP)
top_builddir = $(PRJ_TOP)
includedir = $(PRJ_TOP)
LT_RELEASE = $(PKG_VER)
PKG_LINK = \ PKG_LINK = \
$(GLIB_LIBS) \ $(GLIB_LIBS) $(DIRENT_LIBS) \
..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \ ..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \
..\paint-funcs\apppaint-funcs.lib ..\paint-funcs\apppaint-funcs.lib
...@@ -36,10 +31,9 @@ OBJECTS = \ ...@@ -36,10 +31,9 @@ OBJECTS = \
tile-swap.obj \ tile-swap.obj \
INCLUDES = \ INCLUDES = \
-I$(top_srcdir) \ -I $(PRJ_TOP) \
-I$(top_srcdir)/app \ -I $(PRJ_TOP)/app \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) $(DIRENT_CFLAGS) \
-I$(includedir)
all : \ all : \
$(PRJ_TOP)\config.h \ $(PRJ_TOP)\config.h \
......
...@@ -86,7 +86,7 @@ gimp_tool_info_class_init (GimpToolInfoClass *klass) ...@@ -86,7 +86,7 @@ gimp_tool_info_class_init (GimpToolInfoClass *klass)
viewable_class->get_new_preview = gimp_tool_info_get_new_preview; viewable_class->get_new_preview = gimp_tool_info_get_new_preview;
} }
void static void
gimp_tool_info_init (GimpToolInfo *tool_info) gimp_tool_info_init (GimpToolInfo *tool_info)
{ {
tool_info->tool_type = G_TYPE_NONE; tool_info->tool_type = G_TYPE_NONE;
......
...@@ -5,15 +5,11 @@ PACKAGE = appcore ...@@ -5,15 +5,11 @@ PACKAGE = appcore
PKG_VER = 1.3 PKG_VER = 1.3
!INCLUDE $(TOP)\build\win32\make.msc !INCLUDE $(TOP)\build\win32\make.msc
top_srcdir = $(PRJ_TOP)
top_builddir = $(PRJ_TOP)
includedir = $(PRJ_TOP)
LT_RELEASE = $(PKG_VER)
PKG_LINK = \ PKG_LINK = \
$(GLIB_LIBS) $(GTK2_LIBS) \ $(GLIB_LIBS) $(DIRENT_LIBS) $(GTK2_LIBS) $(INTL_LIBS) \
..\base\appbase-$(PKG_VER).lib \ ..\base\appbase-$(PKG_VER).lib \
..\paint-funcs\apppaint-funcs-$(PKG_VER).lib \ ..\paint-funcs\apppaint-funcs-$(PKG_VER).lib \
..\xcf\xcf.lib \
..\..\libgimpbase\gimpbase-$(PKG_VER).lib \ ..\..\libgimpbase\gimpbase-$(PKG_VER).lib \
..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \ ..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \
..\..\libgimpwidgets\gimpwidgets-$(PKG_VER).lib ..\..\libgimpwidgets\gimpwidgets-$(PKG_VER).lib
...@@ -44,10 +40,12 @@ OBJECTS = \ ...@@ -44,10 +40,12 @@ OBJECTS = \
gimpgradient.obj \ gimpgradient.obj \
gimpimage.obj \ gimpimage.obj \
gimpimage-colorhash.obj \ gimpimage-colorhash.obj \
gimpimage-contiguous-region.obj \
gimpimage-convert.obj \ gimpimage-convert.obj \
gimpimage-crop.obj \ gimpimage-crop.obj \
gimpimage-duplicate.obj \ gimpimage-duplicate.obj \
gimpimage-mask.obj \ gimpimage-mask.obj \
gimpimage-mask-select.obj \
gimpimage-new.obj \ gimpimage-new.obj \
gimpimage-undo.obj \ gimpimage-undo.obj \
gimpimagefile.obj \ gimpimagefile.obj \
...@@ -55,6 +53,8 @@ OBJECTS = \ ...@@ -55,6 +53,8 @@ OBJECTS = \
gimplayermask.obj \ gimplayermask.obj \
gimplist.obj \ gimplist.obj \
gimpmarshal.obj \ gimpmarshal.obj \
gimpmoduleinfo.obj \
gimpmodules.obj \
gimpobject.obj \ gimpobject.obj \
gimppalette.obj \ gimppalette.obj \
gimppalette-import.obj \ gimppalette-import.obj \
...@@ -82,17 +82,18 @@ OTHER_FILES = \ ...@@ -82,17 +82,18 @@ OTHER_FILES = \
INCLUDES = \ INCLUDES = \
-I$(top_srcdir) \ -I$(PRJ_TOP) \
-I$(top_srcdir)/app \ -I$(PRJ_TOP)/app \
$(GTK2_CFLAGS) \ $(DIRENT_CFLAGS) $(GTK2_CFLAGS) \
-I$(includedir)
all : \ all : \
$(PRJ_TOP)\config.h \ $(PRJ_TOP)\config.h \
gimpmarshal.h \ gimpmarshal.h \
gimpmarshal.c \ gimpmarshal.c \
$(PACKAGE).lib \ $(PACKAGE).lib \
!IFDEF DLLGIMP
$(PACKAGE)-$(PKG_VER).dll $(PACKAGE)-$(PKG_VER).dll
!ENDIF
gimpmarshal.h : gimpmarshal.list gimpmarshal.h : gimpmarshal.list
echo #ifndef __GIMP_MARSHAL_H__ > xgen-gmh echo #ifndef __GIMP_MARSHAL_H__ > xgen-gmh
......
...@@ -965,7 +965,7 @@ user_install_run (void) ...@@ -965,7 +965,7 @@ user_install_run (void)
filename = g_build_filename (quoted_data_dir, USER_INSTALL, NULL); filename = g_build_filename (quoted_data_dir, USER_INSTALL, NULL);
command = g_strdup_printf ("%s %s %s %s", command = g_strdup_printf ("%s %s %s %s",
fn, filename,
quoted_data_dir, quoted_data_dir,
quoted_user_dir, quoted_user_dir,
quoted_sysconf_dir); quoted_sysconf_dir);
......
# autogenerated from automake.am with automake.py
# and slightly modified
TOP = ..\..\..
PRJ_TOP = ..\..
PACKAGE = appdisplay
PKG_VER = 1.3
!INCLUDE $(TOP)\build\win32\make.msc
INCLUDES = \
-I$(PRJ_TOP) \
-I$(PRJ_TOP)/app \
$(GTK2_CFLAGS) \
OBJECTS = \
gimpdisplay.obj \
gimpdisplay-callbacks.obj \
gimpdisplay-foreach.obj \
gimpdisplay-ops.obj \
gimpdisplay-render.obj \
gimpdisplay-scale.obj \
gimpdisplay-scroll.obj \
gimpdisplay-selection.obj \
gimpdisplayshell.obj \
gximage.obj \
all : \
$(PRJ_TOP)\config.h \
$(PACKAGE).lib
$(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) $<
# autogenerated from automake.am with automake.py
TOP = ..\..\..
PRJ_TOP = ..\..
PACKAGE = appfile
PKG_VER = 1.3
!INCLUDE $(TOP)\build\win32\make.msc
OBJECTS = \
file-open.obj \
file-save.obj \
file-utils.obj \
INCLUDES = \
-I$(PRJ_TOP) \
-I$(PRJ_TOP)/app \
$(GTK2_CFLAGS) \
all : \
$(PRJ_TOP)\config.h \
$(PACKAGE).lib
$(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) $<
...@@ -23,6 +23,7 @@ OBJECTS = \ ...@@ -23,6 +23,7 @@ OBJECTS = \
brush-editor.obj \ brush-editor.obj \
brush-select.obj \ brush-select.obj \
brushes-commands.obj \ brushes-commands.obj \
buffers-commands.obj \
channels-commands.obj \ channels-commands.obj \
color-area.obj \ color-area.obj \
color-notebook.obj \ color-notebook.obj \
...@@ -34,6 +35,7 @@ OBJECTS = \ ...@@ -34,6 +35,7 @@ OBJECTS = \
dialogs.obj \ dialogs.obj \
dialogs-commands.obj \ dialogs-commands.obj \
dialogs-constructors.obj \ dialogs-constructors.obj \
documents-commands.obj \
edit-commands.obj \ edit-commands.obj \
error-console-dialog.obj \ error-console-dialog.obj \
file-commands.obj \ file-commands.obj \
...@@ -52,6 +54,7 @@ OBJECTS = \ ...@@ -52,6 +54,7 @@ OBJECTS = \
layer-select.obj \ layer-select.obj \
layers-commands.obj \ layers-commands.obj \
menus.obj \ menus.obj \
module-browser.obj \
offset-dialog.obj \ offset-dialog.obj \
palette-editor.obj \ palette-editor.obj \
palette-import-dialog.obj \ palette-import-dialog.obj \
...@@ -82,8 +85,9 @@ INCLUDES = \ ...@@ -82,8 +85,9 @@ INCLUDES = \
all : \ all : \
$(PRJ_TOP)\config.h \ $(PRJ_TOP)\config.h \
$(PACKAGE).lib \ $(PACKAGE).lib \
!IFDEF DLLGIMP
$(PACKAGE)-$(PKG_VER).dll $(PACKAGE)-$(PKG_VER).dll
!ENDIF
$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
......
...@@ -965,7 +965,7 @@ user_install_run (void) ...@@ -965,7 +965,7 @@ user_install_run (void)
filename = g_build_filename (quoted_data_dir, USER_INSTALL, NULL); filename = g_build_filename (quoted_data_dir, USER_INSTALL, NULL);
command = g_strdup_printf ("%s %s %s %s", command = g_strdup_printf ("%s %s %s %s",
fn, filename,
quoted_data_dir, quoted_data_dir,
quoted_user_dir, quoted_user_dir,
quoted_sysconf_dir); quoted_sysconf_dir);
......
...@@ -11,7 +11,7 @@ top_srcdir = $(PRJ_TOP) ...@@ -11,7 +11,7 @@ top_srcdir = $(PRJ_TOP)
top_builddir = $(PRJ_TOP) top_builddir = $(PRJ_TOP)
includedir = $(PRJ_TOP) includedir = $(PRJ_TOP)
LT_RELEASE = $(PKG_VER) LT_RELEASE = $(PKG_VER)
SUBDIRS = paint-funcs base core pdb xcf tools widgets gui SUBDIRS = paint-funcs base xcf core file display pdb tools widgets gui
sub-all: sub-all:
for %d in ($(SUBDIRS)) do nmake -nologo -f makefile.msc sub-one THIS=%d for %d in ($(SUBDIRS)) do nmake -nologo -f makefile.msc sub-one THIS=%d
...@@ -29,17 +29,20 @@ PKG_LINK = \ ...@@ -29,17 +29,20 @@ PKG_LINK = \
widgets/appwidgets.lib \ widgets/appwidgets.lib \
core/appcore.lib \ core/appcore.lib \
base/appbase.lib \ base/appbase.lib \
file/appfile.lib \
display/appdisplay.lib \
xcf/xcf.lib \ xcf/xcf.lib \
$(PRJ_TOP)/regexrepl/regexrepl.lib \ $(PRJ_TOP)/regexrepl/regexrepl.lib \
$(top_builddir)/libgimpcolor/gimpcolor-$(LT_RELEASE).lib \ $(top_builddir)/libgimpcolor/gimpcolor-$(LT_RELEASE).lib \
$(top_builddir)/libgimpmath/gimpmath-$(LT_RELEASE).lib \ $(top_builddir)/libgimpmath/gimpmath-$(LT_RELEASE).lib \
$(top_builddir)/libgimpbase/gimpbase-$(LT_RELEASE).lib \ $(top_builddir)/libgimpbase/gimpbase-$(LT_RELEASE).lib \
$(top_builddir)/libgimpwidgets/gimpwidgets-$(LT_RELEASE).lib \ $(top_builddir)/libgimpwidgets/gimpwidgets-$(LT_RELEASE).lib \
$(DIRENT_LIBS) \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
$(GTK2_LIBS) \ $(GTK2_LIBS) \
$(GIMP_THREAD_LIBS) \ $(GIMP_THREAD_LIBS) \
$(GIMP_MP_LIBS) \ $(GIMP_MP_LIBS) \
$(INTLLIBS) \ $(INTL_LIBS) \
$(PANGO)\pango\pangoft2-$(PANGO_VER).lib $(PANGO)\pango\pangoft2-$(PANGO_VER).lib
gimp_LDFLAGS = \ gimp_LDFLAGS = \
...@@ -60,30 +63,16 @@ mmx_sources = \ ...@@ -60,30 +63,16 @@ mmx_sources = \
OBJECTS = \ OBJECTS = \
colormaps.obj \ colormaps.obj \
devices.obj \ devices.obj \
docindex.obj \
gimpprogress.obj \ gimpprogress.obj \
nav_window.obj \ nav_window.obj \
ops_buttons.obj \ ops_buttons.obj \
qmask.obj \ qmask.obj \
undo_history.obj \ undo_history.obj \
disp_callbacks.obj \
gdisplay.obj \
gdisplay_ops.obj \
gximage.obj \
image_render.obj \
interface.obj \
scale.obj \
scroll.obj \
selection.obj \
image_map.obj \ image_map.obj \
module_db.obj \
user_install.obj \ user_install.obj \
floating_sel.obj \ floating_sel.obj \
general.obj \ general.obj \
gimprc.obj \ gimprc.obj \
file-open.obj \
file-save.obj \
file-utils.obj \
plug_in.obj \ plug_in.obj \
path.obj \ path.obj \
path_curves.obj \ path_curves.obj \
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include "config.h" #include "config.h"
#include <string.h>
#include <glib-object.h> #include <glib-object.h>
......
...@@ -54,6 +54,7 @@ OBJECTS = \ ...@@ -54,6 +54,7 @@ OBJECTS = \
plug_in_cmds.obj \ plug_in_cmds.obj \
procedural_db_cmds.obj \ procedural_db_cmds.obj \
selection_cmds.obj \ selection_cmds.obj \
selection_tools_cmds.obj \
text_tool_cmds.obj \ text_tool_cmds.obj \
tools_cmds.obj \ tools_cmds.obj \
undo_cmds.obj \ undo_cmds.obj \
...@@ -68,8 +69,9 @@ INCLUDES = \ ...@@ -68,8 +69,9 @@ INCLUDES = \
all : \ all : \
$(PRJ_TOP)\config.h \ $(PRJ_TOP)\config.h \
$(PACKAGE).lib \ $(PACKAGE).lib \
!IFDEF DLLGIMP
$(PACKAGE)-$(PKG_VER).dll $(PACKAGE)-$(PKG_VER).dll
!ENDIF
$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include "config.h" #include "config.h"
#include <string.h>
#include <glib-object.h> #include <glib-object.h>
......
...@@ -965,7 +965,7 @@ user_install_run (void) ...@@ -965,7 +965,7 @@ user_install_run (void)
filename = g_build_filename (quoted_data_dir, USER_INSTALL, NULL); filename = g_build_filename (quoted_data_dir, USER_INSTALL, NULL);
command = g_strdup_printf ("%s %s %s %s", command = g_strdup_printf ("%s %s %s %s",
fn, filename,
quoted_data_dir, quoted_data_dir,
quoted_user_dir, quoted_user_dir,
quoted_sysconf_dir); quoted_sysconf_dir);
......
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
#include "config.h" #include "config.h"
#include <string.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets.h"
......
...@@ -41,6 +41,7 @@ OBJECTS = \ ...@@ -41,6 +41,7 @@ OBJECTS = \
gimpdock.obj \ gimpdock.obj \
gimpdockable.obj \ gimpdockable.obj \
gimpdockbook.obj \ gimpdockbook.obj \
gimpdocumentview.obj \
gimpdrawablelistitem.obj \ gimpdrawablelistitem.obj \
gimpdrawablelistview.obj \ gimpdrawablelistview.obj \
gimpdrawablepreview.obj \ gimpdrawablepreview.obj \
...@@ -75,8 +76,9 @@ INCLUDES = \ ...@@ -75,8 +76,9 @@ INCLUDES = \
all : \ all : \
$(PRJ_TOP)\config.h \ $(PRJ_TOP)\config.h \
$(PACKAGE).lib \ $(PACKAGE).lib \
!IFDEF DLLGIMP
$(PACKAGE)-$(PKG_VER).dll $(PACKAGE)-$(PKG_VER).dll
!ENDIF
$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
......
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
/* #undef ENABLE_MP */ /* #undef ENABLE_MP */
#define ENABLE_NLS 1 #define ENABLE_NLS 1
/* #undef HAVE_CATGETS */ /* #undef HAVE_CATGETS */
/* #undef HAVE_DIRENT_H */ #define HAVE_DIRENT_H 1
/* #undef HAVE_DOPRNT */ /* #undef HAVE_DOPRNT */
/* #undef HAVE_GETTEXT */ /* #undef HAVE_GETTEXT */
/* #undef HAVE_IPC_H */ /* #undef HAVE_IPC_H */
...@@ -151,9 +151,6 @@ ...@@ -151,9 +151,6 @@
/* Define if you have the <argz.h> header file. */ /* Define if you have the <argz.h> header file. */
/* #undef HAVE_ARGZ_H */ /* #undef HAVE_ARGZ_H */
/* Define if you have the <dirent.h> header file. */
/* #undef HAVE_DIRENT_H */
/* Define if you have the <limits.h> header file. */ /* Define if you have the <limits.h> header file. */
#define HAVE_LIMITS_H 1 #define HAVE_LIMITS_H 1
......
...@@ -67,6 +67,7 @@ PDB_WRAPPERS_O = \ ...@@ -67,6 +67,7 @@ PDB_WRAPPERS_O = \
gimpplugin_pdb.obj \ gimpplugin_pdb.obj \
gimpproceduraldb_pdb.obj \ gimpproceduraldb_pdb.obj \
gimpselection_pdb.obj \ gimpselection_pdb.obj \
gimpselectiontools_pdb.obj \
gimptexttool_pdb.obj \ gimptexttool_pdb.obj \
gimptools_pdb.obj \ gimptools_pdb.obj \
gimpundo_pdb.obj \ gimpundo_pdb.obj \
...@@ -91,7 +92,6 @@ gimp_OBJECTS = \ ...@@ -91,7 +92,6 @@ gimp_OBJECTS = \
# $(gimpi_OBJECTS) \ # $(gimpi_OBJECTS) \
gimpchannel.obj \ gimpchannel.obj \
gimpdrawable.obj \ gimpdrawable.obj \
gimpgradientselect.obj \
gimphelp.obj \ gimphelp.obj \
gimpimage.obj \ gimpimage.obj \
gimplayer.obj \ gimplayer.obj \
......
EXPORTS EXPORTS
gimp_button_extended_clicked
gimp_button_get_type gimp_button_get_type
gimp_button_new gimp_button_new
gimp_chain_button_get_active gimp_chain_button_get_active
...@@ -6,23 +7,16 @@ EXPORTS ...@@ -6,23 +7,16 @@ EXPORTS
gimp_chain_button_new gimp_chain_button_new
gimp_chain_button_set_active gimp_chain_button_set_active
gimp_color_area_get_color gimp_color_area_get_color
gimp_color_area_get_color
gimp_color_area_get_type
gimp_color_area_get_type gimp_color_area_get_type
gimp_color_area_has_alpha gimp_color_area_has_alpha
gimp_color_area_new gimp_color_area_new
gimp_color_area_new
gimp_color_area_set_color
gimp_color_area_set_color gimp_color_area_set_color
gimp_color_area_set_type gimp_color_area_set_type
gimp_color_button_get_color gimp_color_button_get_color
gimp_color_button_get_color
gimp_color_button_get_type
gimp_color_button_get_type gimp_color_button_get_type
gimp_color_button_has_alpha gimp_color_button_has_alpha
gimp_color_button_new gimp_color_button_new
gimp_color_button_set_color gimp_color_button_set_color
gimp_color_button_set_color
gimp_color_button_set_type gimp_color_button_set_type
gimp_context_help gimp_context_help
gimp_coordinates_new gimp_coordinates_new
...@@ -90,8 +84,8 @@ EXPORTS ...@@ -90,8 +84,8 @@ EXPORTS
gimp_size_entry_set_value gimp_size_entry_set_value
gimp_size_entry_set_value_boundaries gimp_size_entry_set_value_boundaries
gimp_spin_button_new gimp_spin_button_new
gimp_stock_init
gimp_standard_help_func gimp_standard_help_func
gimp_stock_init
gimp_table_attach_aligned gimp_table_attach_aligned
gimp_toggle_button_sensitive_update gimp_toggle_button_sensitive_update
gimp_toggle_button_update gimp_toggle_button_update
......
...@@ -176,6 +176,7 @@ OBJECTS = \ ...@@ -176,6 +176,7 @@ OBJECTS = \
Events.obj \ Events.obj \
FractalExplorer.obj \ FractalExplorer.obj \
Globals.obj Globals.obj
EXTRALIBS = $(DIRENT_LIBS)
!ENDIF !ENDIF
!IFDEF EXTRA_Lighting !IFDEF EXTRA_Lighting
...@@ -278,6 +279,7 @@ OBJECTS = \ ...@@ -278,6 +279,7 @@ OBJECTS = \
gap_exchange_image.obj \ gap_exchange_image.obj \
gap_pdb_calls.obj \ gap_pdb_calls.obj \
resize.obj resize.obj
EXTRALIBS = $(DIRENT_LIBS)
!ENDIF !ENDIF
!IFDEF EXTRA_gdyntext !IFDEF EXTRA_gdyntext
...@@ -291,6 +293,14 @@ OBJECTS = \ ...@@ -291,6 +293,14 @@ OBJECTS = \
gdyntextcompat.obj gdyntextcompat.obj
!ENDIF !ENDIF
!IFDEF EXTRA_gfig
EXTRALIBS = $(DIRENT_LIBS)
!ENDIF
!IFDEF EXTRA_gflare
EXTRALIBS = $(DIRENT_LIBS)
!ENDIF
!IFDEF EXTRA_gfli !IFDEF EXTRA_gfli
OBJECTS = \ OBJECTS = \
fli.obj \ fli.obj \
...@@ -436,7 +446,7 @@ OBJECTS = \ ...@@ -436,7 +446,7 @@ OBJECTS = \
script-fu-scripts.obj \ script-fu-scripts.obj \
script-fu-text-console.obj \ script-fu-text-console.obj \
..\dbbrowser\dbbrowser_utils.obj ..\dbbrowser\dbbrowser_utils.obj
EXTRALIBS = ..\..\regexrepl\regexrepl.lib EXTRALIBS = ..\..\regexrepl\regexrepl.lib $(DIRENT_LIBS)
EXTRACFLAGS = -DREGEX_MALLOC EXTRACFLAGS = -DREGEX_MALLOC
HAVE_RESOURCE = YES HAVE_RESOURCE = YES
!ENDIF !ENDIF
...@@ -493,6 +503,8 @@ OBJECTS = \ ...@@ -493,6 +503,8 @@ OBJECTS = \
repaint.obj \ repaint.obj \
size.obj \ size.obj \
sizemap.obj sizemap.obj
EXTRALIBS = $(DIRENT_LIBS)
!ENDIF !ENDIF
!IFDEF EXTRA_guash !IFDEF EXTRA_guash
...@@ -578,7 +590,9 @@ RTL = -MDd ...@@ -578,7 +590,9 @@ RTL = -MDd
CC = cl -nologo -G5 -GF $(OPTIMIZE) $(RTL) -W2 -Zm200 CC = cl -nologo -G5 -GF $(OPTIMIZE) $(RTL) -W2 -Zm200
CFLAGS = -DHAVE_CONFIG_H $(EXTRACFLAGS) -I. -I$(GIMPTOP) -I$(PLUGINDIR) $(GTK2_CFLAGS) -I$(INTL) CFLAGS = -DHAVE_CONFIG_H $(EXTRACFLAGS) $(DIRENT_CFLAGS) \
-DGETTEXT_PACKAGE=\"libgimp14\" -DLOCALEDIR=\"?\" \
-I. -I$(GIMPTOP) -I$(PLUGINDIR) $(GTK2_CFLAGS) $(INTL_CFLAGS)
LDFLAGS = /link /subsystem:console /machine:ix86 $(LINKDEBUG) LDFLAGS = /link /subsystem:console /machine:ix86 $(LINKDEBUG)
......
...@@ -324,7 +324,7 @@ CODE ...@@ -324,7 +324,7 @@ CODE
); );
} }
@headers = qw("core/gimp.h" "core/gimpcontext.h" @headers = qw(<string.h> "core/gimp.h" "core/gimpcontext.h"
"core/gimpcontainer.h" "core/gimpdatafactory.h" "core/gimpcontainer.h" "core/gimpdatafactory.h"
"core/gimplist.h" "core/gimpgradient.h"); "core/gimplist.h" "core/gimpgradient.h");
......
...@@ -347,7 +347,7 @@ CODE ...@@ -347,7 +347,7 @@ CODE
@headers = qw("core/gimp.h" "core/gimpcontext.h"