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

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
This commit is contained in:
Hans Breuer 2001-10-28 18:45:45 +00:00 committed by Hans Breuer
parent 6d4e0509d4
commit 39dbecb70f
22 changed files with 174 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ChangeLog
View File

@ -1,3 +1,30 @@
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>
* plug-ins/common/nlfilt.c

14
app/base/makefile.msc
View File

@ -7,13 +7,8 @@ PACKAGE = appbase
PKG_VER = 1.3
!INCLUDE $(TOP)\build\win32\make.msc
top_srcdir = $(PRJ_TOP)
top_builddir = $(PRJ_TOP)
includedir = $(PRJ_TOP)
LT_RELEASE = $(PKG_VER)
PKG_LINK = \
$(GLIB_LIBS) \
$(GLIB_LIBS) $(DIRENT_LIBS) \
..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \
..\paint-funcs\apppaint-funcs.lib
@ -36,10 +31,9 @@ OBJECTS = \
tile-swap.obj \
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GLIB_CFLAGS) \
-I$(includedir)
-I $(PRJ_TOP) \
-I $(PRJ_TOP)/app \
$(GLIB_CFLAGS) $(DIRENT_CFLAGS) \
all : \
$(PRJ_TOP)\config.h \

2
app/core/gimptoolinfo.c
View File

@ -86,7 +86,7 @@ gimp_tool_info_class_init (GimpToolInfoClass *klass)
viewable_class->get_new_preview = gimp_tool_info_get_new_preview;
}
void
static void
gimp_tool_info_init (GimpToolInfo *tool_info)
{
tool_info->tool_type = G_TYPE_NONE;

21
app/core/makefile.msc
View File

@ -5,15 +5,11 @@ PACKAGE = appcore
PKG_VER = 1.3
!INCLUDE $(TOP)\build\win32\make.msc
top_srcdir = $(PRJ_TOP)
top_builddir = $(PRJ_TOP)
includedir = $(PRJ_TOP)
LT_RELEASE = $(PKG_VER)
PKG_LINK = \
$(GLIB_LIBS) $(GTK2_LIBS) \
$(GLIB_LIBS) $(DIRENT_LIBS) $(GTK2_LIBS) $(INTL_LIBS) \
..\base\appbase-$(PKG_VER).lib \
..\paint-funcs\apppaint-funcs-$(PKG_VER).lib \
..\xcf\xcf.lib \
..\..\libgimpbase\gimpbase-$(PKG_VER).lib \
..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \
..\..\libgimpwidgets\gimpwidgets-$(PKG_VER).lib
@ -44,10 +40,12 @@ OBJECTS = \
gimpgradient.obj \
gimpimage.obj \
gimpimage-colorhash.obj \
gimpimage-contiguous-region.obj \
gimpimage-convert.obj \
gimpimage-crop.obj \
gimpimage-duplicate.obj \
gimpimage-mask.obj \
gimpimage-mask-select.obj \
gimpimage-new.obj \
gimpimage-undo.obj \
gimpimagefile.obj \
@ -55,6 +53,8 @@ OBJECTS = \
gimplayermask.obj \
gimplist.obj \
gimpmarshal.obj \
gimpmoduleinfo.obj \
gimpmodules.obj \
gimpobject.obj \
gimppalette.obj \
gimppalette-import.obj \
@ -82,17 +82,18 @@ OTHER_FILES = \
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GTK2_CFLAGS) \
-I$(includedir)
-I$(PRJ_TOP) \
-I$(PRJ_TOP)/app \
$(DIRENT_CFLAGS) $(GTK2_CFLAGS) \
all : \
$(PRJ_TOP)\config.h \
gimpmarshal.h \
gimpmarshal.c \
$(PACKAGE).lib \
!IFDEF DLLGIMP
$(PACKAGE)-$(PKG_VER).dll
!ENDIF
gimpmarshal.h : gimpmarshal.list
echo #ifndef __GIMP_MARSHAL_H__ > xgen-gmh

2
app/dialogs/user-install-dialog.c
View File

@ -965,7 +965,7 @@ user_install_run (void)
filename = g_build_filename (quoted_data_dir, USER_INSTALL, NULL);
command = g_strdup_printf ("%s %s %s %s",
fn,
filename,
quoted_data_dir,
quoted_user_dir,
quoted_sysconf_dir);

47
app/display/makefile.msc Normal file
View File

@ -0,0 +1,47 @@
# 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) $<

39
app/file/makefile.msc Normal file
View File

@ -0,0 +1,39 @@
# 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) $<

6
app/gui/makefile.msc
View File

@ -23,6 +23,7 @@ OBJECTS = \
brush-editor.obj \
brush-select.obj \
brushes-commands.obj \
buffers-commands.obj \
channels-commands.obj \
color-area.obj \
color-notebook.obj \
@ -34,6 +35,7 @@ OBJECTS = \
dialogs.obj \
dialogs-commands.obj \
dialogs-constructors.obj \
documents-commands.obj \
edit-commands.obj \
error-console-dialog.obj \
file-commands.obj \
@ -52,6 +54,7 @@ OBJECTS = \
layer-select.obj \
layers-commands.obj \
menus.obj \
module-browser.obj \
offset-dialog.obj \
palette-editor.obj \
palette-import-dialog.obj \
@ -82,8 +85,9 @@ INCLUDES = \
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

2
app/gui/user-install-dialog.c
View File

@ -965,7 +965,7 @@ user_install_run (void)
filename = g_build_filename (quoted_data_dir, USER_INSTALL, NULL);
command = g_strdup_printf ("%s %s %s %s",
fn,
filename,
quoted_data_dir,
quoted_user_dir,
quoted_sysconf_dir);

21
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 core pdb xcf tools widgets gui
SUBDIRS = paint-funcs base xcf core file display pdb tools widgets gui
sub-all:
for %d in ($(SUBDIRS)) do nmake -nologo -f makefile.msc sub-one THIS=%d
@ -29,17 +29,20 @@ PKG_LINK = \
widgets/appwidgets.lib \
core/appcore.lib \
base/appbase.lib \
file/appfile.lib \
display/appdisplay.lib \
xcf/xcf.lib \
$(PRJ_TOP)/regexrepl/regexrepl.lib \
$(top_builddir)/libgimpcolor/gimpcolor-$(LT_RELEASE).lib \
$(top_builddir)/libgimpmath/gimpmath-$(LT_RELEASE).lib \
$(top_builddir)/libgimpbase/gimpbase-$(LT_RELEASE).lib \
$(top_builddir)/libgimpwidgets/gimpwidgets-$(LT_RELEASE).lib \
$(DIRENT_LIBS) \
$(GLIB_LIBS) \
$(GTK2_LIBS) \
$(GIMP_THREAD_LIBS) \
$(GIMP_MP_LIBS) \
$(INTLLIBS) \
$(INTL_LIBS) \
$(PANGO)\pango\pangoft2-$(PANGO_VER).lib
gimp_LDFLAGS = \
@ -60,30 +63,16 @@ mmx_sources = \
OBJECTS = \
colormaps.obj \
devices.obj \
docindex.obj \
gimpprogress.obj \
nav_window.obj \
ops_buttons.obj \
qmask.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 \
module_db.obj \
user_install.obj \
floating_sel.obj \
general.obj \
gimprc.obj \
file-open.obj \
file-save.obj \
file-utils.obj \
plug_in.obj \
path.obj \
path_curves.obj \

1
app/pdb/gradients_cmds.c
View File

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

4
app/pdb/makefile.msc
View File

@ -54,6 +54,7 @@ OBJECTS = \
plug_in_cmds.obj \
procedural_db_cmds.obj \
selection_cmds.obj \
selection_tools_cmds.obj \
text_tool_cmds.obj \
tools_cmds.obj \
undo_cmds.obj \
@ -68,8 +69,9 @@ INCLUDES = \
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

1
app/pdb/palette_cmds.c
View File

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

2
app/user_install.c
View File

@ -965,7 +965,7 @@ user_install_run (void)
filename = g_build_filename (quoted_data_dir, USER_INSTALL, NULL);
command = g_strdup_printf ("%s %s %s %s",
fn,
filename,
quoted_data_dir,
quoted_user_dir,
quoted_sysconf_dir);

2
app/widgets/gimpdocumentview.c
View File

@ -21,6 +21,8 @@
#include "config.h"
#include <string.h>
#include <gtk/gtk.h>
#include "libgimpwidgets/gimpwidgets.h"

4
app/widgets/makefile.msc
View File

@ -41,6 +41,7 @@ OBJECTS = \
gimpdock.obj \
gimpdockable.obj \
gimpdockbook.obj \
gimpdocumentview.obj \
gimpdrawablelistitem.obj \
gimpdrawablelistview.obj \
gimpdrawablepreview.obj \
@ -75,8 +76,9 @@ INCLUDES = \
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

5
config.h.win32
View File

@ -71,7 +71,7 @@
/* #undef ENABLE_MP */
#define ENABLE_NLS 1
/* #undef HAVE_CATGETS */
/* #undef HAVE_DIRENT_H */
#define HAVE_DIRENT_H 1
/* #undef HAVE_DOPRNT */
/* #undef HAVE_GETTEXT */
/* #undef HAVE_IPC_H */
@ -151,9 +151,6 @@
/* Define if you have the <argz.h> header file. */
/* #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 HAVE_LIMITS_H 1

2
libgimp/makefile.msc
View File

@ -67,6 +67,7 @@ PDB_WRAPPERS_O = \
gimpplugin_pdb.obj \
gimpproceduraldb_pdb.obj \
gimpselection_pdb.obj \
gimpselectiontools_pdb.obj \
gimptexttool_pdb.obj \
gimptools_pdb.obj \
gimpundo_pdb.obj \
@ -91,7 +92,6 @@ gimp_OBJECTS = \
# $(gimpi_OBJECTS) \
gimpchannel.obj \
gimpdrawable.obj \
gimpgradientselect.obj \
gimphelp.obj \
gimpimage.obj \
gimplayer.obj \

10
libgimpwidgets/gimpwidgets.def
View File

@ -1,4 +1,5 @@
EXPORTS
gimp_button_extended_clicked
gimp_button_get_type
gimp_button_new
gimp_chain_button_get_active
@ -6,23 +7,16 @@ EXPORTS
gimp_chain_button_new
gimp_chain_button_set_active
gimp_color_area_get_color
gimp_color_area_get_color
gimp_color_area_get_type
gimp_color_area_get_type
gimp_color_area_has_alpha
gimp_color_area_new
gimp_color_area_new
gimp_color_area_set_color
gimp_color_area_set_color
gimp_color_area_set_type
gimp_color_button_get_color
gimp_color_button_get_color
gimp_color_button_get_type
gimp_color_button_get_type
gimp_color_button_has_alpha
gimp_color_button_new
gimp_color_button_set_color
gimp_color_button_set_color
gimp_color_button_set_type
gimp_context_help
gimp_coordinates_new
@ -90,8 +84,8 @@ EXPORTS
gimp_size_entry_set_value
gimp_size_entry_set_value_boundaries
gimp_spin_button_new
gimp_stock_init
gimp_standard_help_func
gimp_stock_init
gimp_table_attach_aligned
gimp_toggle_button_sensitive_update
gimp_toggle_button_update

18
plug-ins/makefile.msc
View File

@ -176,6 +176,7 @@ OBJECTS = \
Events.obj \
FractalExplorer.obj \
Globals.obj
EXTRALIBS = $(DIRENT_LIBS)
!ENDIF
!IFDEF EXTRA_Lighting
@ -278,6 +279,7 @@ OBJECTS = \
gap_exchange_image.obj \
gap_pdb_calls.obj \
resize.obj
EXTRALIBS = $(DIRENT_LIBS)
!ENDIF
!IFDEF EXTRA_gdyntext
@ -291,6 +293,14 @@ OBJECTS = \
gdyntextcompat.obj
!ENDIF
!IFDEF EXTRA_gfig
EXTRALIBS = $(DIRENT_LIBS)
!ENDIF
!IFDEF EXTRA_gflare
EXTRALIBS = $(DIRENT_LIBS)
!ENDIF
!IFDEF EXTRA_gfli
OBJECTS = \
fli.obj \
@ -436,7 +446,7 @@ OBJECTS = \
script-fu-scripts.obj \
script-fu-text-console.obj \
..\dbbrowser\dbbrowser_utils.obj
EXTRALIBS = ..\..\regexrepl\regexrepl.lib
EXTRALIBS = ..\..\regexrepl\regexrepl.lib $(DIRENT_LIBS)
EXTRACFLAGS = -DREGEX_MALLOC
HAVE_RESOURCE = YES
!ENDIF
@ -493,6 +503,8 @@ OBJECTS = \
repaint.obj \
size.obj \
sizemap.obj
EXTRALIBS = $(DIRENT_LIBS)
!ENDIF
!IFDEF EXTRA_guash
@ -578,7 +590,9 @@ RTL = -MDd
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)

2
tools/pdbgen/pdb/gradients.pdb
View File

@ -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/gimplist.h" "core/gimpgradient.h");

2
tools/pdbgen/pdb/palette.pdb
View File

@ -347,7 +347,7 @@ CODE
@headers = qw("core/gimp.h" "core/gimpcontext.h"
@headers = qw(<string.h> "core/gimp.h" "core/gimpcontext.h"
"core/gimpdatafactory.h" "core/gimplist.h" "core/gimppalette.h");
@procs = qw(palette_get_foreground palette_get_background