callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

when checking for 'excecutable' make sure it is a regular file too (on

Browse Source 
2003-01-01  Hans Breuer  <hans@breuer.org>

	* libgimpbase/gimpdatafiles.c : when checking for
	'excecutable' make sure it is a regular file too
	(on win32 even directories carry the IXUSR flag)

	* app/app_procs.h : there is still no #warning with
	msvc, special case to make it build with non GCC

	* makefile.msc */makefile.msc */*/makefile.msc : updated

	* app/gui/user-install-dialog.c : get prototype for mkdir

	* libgimpwidgets/libgimp-glue.c : make it compile without
	LT_RELEASE being defined

	* modules/module.def : removed
	  modules/Makefile.am : no export file needed when
	functions get exported by G_MODULE_EXPORT
This commit is contained in:
Hans Breuer
2003-01-01 13:33:27 +00:00
committed by Hans Breuer
parent 9897f388ae
commit 8364722f2d
20 changed files with 116 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@ -1,3 +1,23 @@
2003-01-01 Hans Breuer <hans@breuer.org>
* libgimpbase/gimpdatafiles.c : when checking for
'excecutable' make sure it is a regular file too
(on win32 even directories carry the IXUSR flag)
* app/app_procs.h : there is still no #warning with
msvc, special case to make it build with non GCC
* makefile.msc */makefile.msc */*/makefile.msc : updated
* app/gui/user-install-dialog.c : get prototype for mkdir
* libgimpwidgets/libgimp-glue.c : make it compile without
LT_RELEASE being defined
* modules/module.def : removed
modules/Makefile.am : no export file needed when
functions get exported by G_MODULE_EXPORT
2003-01-01 Maurits Rijk <lpeek.mrijk@consunet.nl> 2003-01-01 Maurits Rijk <lpeek.mrijk@consunet.nl>
* plug-ins/imagemap/imap_about.c * plug-ins/imagemap/imap_about.c

4
app/app_procs.h
View File

@ -20,7 +20,11 @@
#define __APP_PROCS_H__ #define __APP_PROCS_H__
#ifndef GIMP_APP_GLUE_COMPILATION #ifndef GIMP_APP_GLUE_COMPILATION
#ifdef __GNUC__
#warning FIXME: Dont #include "app_procs.h" #warning FIXME: Dont #include "app_procs.h"
#elif defined _MSC_VER
#pragma message ("FIXME: Dont #include 'app_procs.h'")
#endif
#endif #endif
/* /*

3
app/base/makefile.msc
View File

@ -10,7 +10,8 @@ PKG_VER = 1.3
PKG_LINK = \ PKG_LINK = \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \ ..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \
..\paint-funcs\apppaint-funcs.lib ..\paint-funcs\apppaint-funcs-$(PKG_VER).lib \
..\config\appconfig-$(PKG_VER).lib
OBJECTS = \ OBJECTS = \
base.obj \ base.obj \

7
app/config/makefile.msc
View File

@ -20,15 +20,18 @@ OBJECTS = \
gimpconfig.obj \ gimpconfig.obj \
gimpconfig-deserialize.obj \ gimpconfig-deserialize.obj \
gimpconfig-params.obj \ gimpconfig-params.obj \
gimpconfig-path.obj \
gimpconfig-serialize.obj \ gimpconfig-serialize.obj \
gimpconfig-substitute.obj \
gimpconfig-types.obj \ gimpconfig-types.obj \
gimpconfig-utils.obj \ gimpconfig-utils.obj \
gimpcoreconfig.obj \ gimpcoreconfig.obj \
gimpdisplayconfig.obj \ gimpdisplayconfig.obj \
gimpguiconfig.obj \ gimpguiconfig.obj \
gimppluginconfig.obj \
gimprc.obj \ gimprc.obj \
gimpscanner.obj gimpscanner.obj \
\
# config-noelf.obj
INCLUDES = \ INCLUDES = \
-FImsvc_recommended_pragmas.h \ -FImsvc_recommended_pragmas.h \

24
app/core/makefile.msc
View File

@ -6,16 +6,26 @@ PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc !INCLUDE $(TOP)\glib\build\win32\make.msc
PKG_LINK = \ PKG_LINK = \
$(GLIB_LIBS) $(GTK2_LIBS) $(INTL_LIBS) \ $(GLIB_LIBS) $(GTK2)\gdk-pixbuf\gdk_pixbuf-$(GTK2_VER).lib $(INTL_LIBS) \
$(LIBART_LIBS) \ $(LIBART_LIBS) $(PANGOFT2_LIBS) \
..\base\appbase-$(PKG_VER).lib \ \
..\paint-funcs\apppaint-funcs-$(PKG_VER).lib \ ..\..\regexrepl\regexrepl.lib \
# ..\vectors\appvectors-$(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 \
..\..\libgimpmath\gimpmath-$(PKG_VER).lib \ ..\..\libgimpmath\gimpmath-$(PKG_VER).lib \
..\..\libgimpwidgets\gimpwidgets-$(PKG_VER).lib ..\..\libgimpmodule\gimpmodule-$(PKG_VER).lib \
..\..\libgimpwidgets\gimpwidgets-$(PKG_VER).lib \
\
..\config\appconfig-$(PKG_VER).lib \
..\base\appbase-$(PKG_VER).lib \
..\paint-funcs\apppaint-funcs-$(PKG_VER).lib \
..\vectors\appvectors.lib \
..\paint\apppaint.lib \
..\pdb\apppdb.lib \
..\plug-in\appplug-in.lib \
..\file\appfile.lib \
..\xcf\xcf.lib \
OBJECTS = \ OBJECTS = \
# ..\undo.obj \ # ..\undo.obj \

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

@ -31,6 +31,10 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#ifdef G_OS_WIN32
#include <direct.h> /* _mkdir() */
#endif
#include "libgimpmath/gimpmath.h" #include "libgimpmath/gimpmath.h"
#include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpbase.h"
#include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets.h"

11
app/display/makefile.msc
View File

@ -15,6 +15,11 @@ INCLUDES = \
DEFINES = \ DEFINES = \
-DG_LOG_DOMAIN=\"Gimp-Display\" -DG_LOG_DOMAIN=\"Gimp-Display\"
PKG_LINK = \
$(GLIB_LIBS) $(GTK2_LIBS) \
..\base\appbase-$(PKG_VER).lib \
..\core\appcore-$(PKG_VER).lib \
OBJECTS = \ OBJECTS = \
gimpdisplay.obj \ gimpdisplay.obj \
gimpdisplay-area.obj \ gimpdisplay-area.obj \
@ -38,8 +43,10 @@ OBJECTS = \
all : \ all : \
$(PRJ_TOP)\config.h \ $(PRJ_TOP)\config.h \
$(PACKAGE).lib $(PACKAGE).lib \
!IFDEF DLLGIMP
$(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

10
app/file/makefile.msc
View File

@ -19,9 +19,17 @@ INCLUDES = \
DEFINES = \ DEFINES = \
-DG_LOG_DOMAIN=\"Gimp-File\" -DG_LOG_DOMAIN=\"Gimp-File\"
PKG_LINK = \
$(GLIB_LIBS) $(INTL_LIBS) \
..\base\appbase-$(PKG_VER).lib \
..\core\appcore-$(PKG_VER).lib \
all : \ all : \
$(PRJ_TOP)\config.h \ $(PRJ_TOP)\config.h \
$(PACKAGE).lib $(PACKAGE).lib \
!IFDEF DLLGIMP
$(PACKAGE)-$(PKG_VER).dll
!ENDIF
$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32

2
app/gui/makefile.msc
View File

@ -18,7 +18,7 @@ PKG_LINK = \
..\base\appbase-$(PKG_VER).lib \ ..\base\appbase-$(PKG_VER).lib \
..\core\appcore-$(PKG_VER).lib \ ..\core\appcore-$(PKG_VER).lib \
..\file\appfile-$(PKG_VER).lib \ ..\file\appfile-$(PKG_VER).lib \
..\pdb\apppdb-$(PKG_VER).lib \ # ..\pdb\apppdb-$(PKG_VER).lib \
..\vectors\appvectors-$(PKG_VER).lib \ ..\vectors\appvectors-$(PKG_VER).lib \
..\paint-funcs\apppaint-funcs-$(PKG_VER).lib \ ..\paint-funcs\apppaint-funcs-$(PKG_VER).lib \
..\display\appdisplay-$(PKG_VER).lib \ ..\display\appdisplay-$(PKG_VER).lib \

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

@ -31,6 +31,10 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#ifdef G_OS_WIN32
#include <direct.h> /* _mkdir() */
#endif
#include "libgimpmath/gimpmath.h" #include "libgimpmath/gimpmath.h"
#include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpbase.h"
#include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets.h"

1
app/makefile.msc
View File

@ -61,6 +61,7 @@ gimp_LDFLAGS = \
-export-dynamic -export-symbols $(srcdir)/gimp.sym -export-dynamic -export-symbols $(srcdir)/gimp.sym
INCLUDES = \ INCLUDES = \
-DGIMP_APP_GLUE_COMPILATION \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intl \ -I$(top_srcdir)/intl \
$(GTK2_CFLAGS) \ $(GTK2_CFLAGS) \

11
app/pdb/makefile.msc
View File

@ -24,10 +24,16 @@ PKG_LINK = \
..\widgets\appwidgets-$(PKG_VER).lib \ ..\widgets\appwidgets-$(PKG_VER).lib \
OBJECTS_UI = \
brush_select_cmds.obj \
gradient_select_cmds.obj \
palette_select_cmds.obj \
pattern_select_cmds.obj \
OBJECTS = \ OBJECTS = \
$(OBJECTS_UI) \
internal_procs.obj \ internal_procs.obj \
procedural_db.obj \ procedural_db.obj \
brush_select_cmds.obj \
brushes_cmds.obj \ brushes_cmds.obj \
channel_cmds.obj \ channel_cmds.obj \
color_cmds.obj \ color_cmds.obj \
@ -38,7 +44,6 @@ OBJECTS = \
fileops_cmds.obj \ fileops_cmds.obj \
floating_sel_cmds.obj \ floating_sel_cmds.obj \
gimprc_cmds.obj \ gimprc_cmds.obj \
gradient_select_cmds.obj \
gradients_cmds.obj \ gradients_cmds.obj \
guides_cmds.obj \ guides_cmds.obj \
help_cmds.obj \ help_cmds.obj \
@ -49,11 +54,9 @@ OBJECTS = \
misc_tools_cmds.obj \ misc_tools_cmds.obj \
paint_tools_cmds.obj \ paint_tools_cmds.obj \
palette_cmds.obj \ palette_cmds.obj \
palette_select_cmds.obj \
palettes_cmds.obj \ palettes_cmds.obj \
parasite_cmds.obj \ parasite_cmds.obj \
paths_cmds.obj \ paths_cmds.obj \
pattern_select_cmds.obj \
patterns_cmds.obj \ patterns_cmds.obj \
plug_in_cmds.obj \ plug_in_cmds.obj \
procedural_db_cmds.obj \ procedural_db_cmds.obj \

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

@ -7,6 +7,7 @@ PKG_VER = 1.3
PKG_LINK = \ PKG_LINK = \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
..\config\appconfig-$(PKG_VER).lib \
..\base\appbase-$(PKG_VER).lib \ ..\base\appbase-$(PKG_VER).lib \
..\..\libgimpbase\gimpbase-$(PKG_VER).lib \ ..\..\libgimpbase\gimpbase-$(PKG_VER).lib \
\ \
@ -30,7 +31,7 @@ INCLUDES = \
all : \ all : \
$(PRJ_TOP)\config.h \ $(PRJ_TOP)\config.h \
$(PACKAGE).lib \ $(PACKAGE).lib \
!IFDEF DLL_GIMP !IFDEF DLLGIMP
$(PACKAGE)-$(PKG_VER).dll $(PACKAGE)-$(PKG_VER).dll
!ENDIF !ENDIF

5
app/widgets/makefile.msc
View File

@ -19,7 +19,7 @@ PKG_LINK = \
..\core\appcore-$(PKG_VER).lib \ ..\core\appcore-$(PKG_VER).lib \
..\config\appconfig-$(PKG_VER).lib \ ..\config\appconfig-$(PKG_VER).lib \
..\file\appfile-$(PKG_VER).lib \ ..\file\appfile-$(PKG_VER).lib \
..\pdb\apppdb-$(PKG_VER).lib \ # ..\pdb\apppdb-$(PKG_VER).lib \
# ..\gui\appgui-$(PKG_VER).lib # ..\gui\appgui-$(PKG_VER).lib
OBJECTS = \ OBJECTS = \
@ -104,6 +104,9 @@ INCLUDES = \
$(GTK2_CFLAGS) $(FREETYPE2_CFLAGS) \ $(GTK2_CFLAGS) $(FREETYPE2_CFLAGS) \
-I$(includedir) -I$(includedir)
DEFINES = \
-DG_LOG_DOMAIN=\"Gimp-Widgets\"
all : \ all : \
$(PRJ_TOP)\config.h \ $(PRJ_TOP)\config.h \
$(PACKAGE).lib \ $(PACKAGE).lib \

3
libgimpbase/gimpdatafiles.c
View File

@ -195,7 +195,8 @@ gimp_datafiles_read_directories (const gchar *path_str,
} }
#endif #endif
else if ((flags & G_FILE_TEST_IS_EXECUTABLE) && else if ((flags & G_FILE_TEST_IS_EXECUTABLE) &&
((filestat.st_mode & S_IXUSR) || (((filestat.st_mode & S_IXUSR) &&
!S_ISDIR (filestat.st_mode)) ||
(S_ISREG (filestat.st_mode) && (S_ISREG (filestat.st_mode) &&
is_script (filename)))) is_script (filename))))
{ {

2
libgimpwidgets/libgimp-glue.c
View File

@ -78,8 +78,10 @@ dynamic_resolve (const gchar* name, HMODULE* hMod)
if (!fn) if (!fn)
{ {
#if defined (LT_RELEASE) && defined (LT_CURRENT_MINUS_AGE)
/* First try the libtool style name */ /* First try the libtool style name */
*hMod = LoadLibrary ("libgimp-" LT_RELEASE "-" LT_CURRENT_MINUS_AGE ".dll"); *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 that didn't work, try the name style used by Hans Breuer */
if (!hMod) if (!hMod)
*hMod = LoadLibrary ("gimp-1.3.dll"); *hMod = LoadLibrary ("gimp-1.3.dll");

4
makefile.msc
View File

@ -12,9 +12,11 @@ SUBDIRS = \
libgimpmath \ libgimpmath \
libgimpwidgets \ libgimpwidgets \
libgimp \ libgimp \
libgimptool \
libgimpmodule \
regexrepl \ regexrepl \
app \ app \
plug-ins \ # plug-ins \
modules modules
sub-all: sub-all:

1
modules/Makefile.am
View File

@ -16,7 +16,6 @@ INCLUDES = \
EXTRA_DIST = \ EXTRA_DIST = \
makefile.msc \ makefile.msc \
module.def \
colorsel_water.c colorsel_water.c
lib_LTLIBRARIES = \ lib_LTLIBRARIES = \

31
modules/makefile.msc
View File

@ -29,7 +29,8 @@ BIN = $(GIMP)\modules
MODULES = \ MODULES = \
# colorsel_gtk-$(GIMP_VER).dll \ # colorsel_gtk-$(GIMP_VER).dll \
colorsel_triangle-$(GIMP_VER).dll \ colorsel_triangle-$(GIMP_VER).dll \
# colorsel_water-$(GIMP_VER).dll \ colorsel_water-$(GIMP_VER).dll \
cdisplay_colorblind-$(GIMP_VER).dll \
cdisplay_gamma-$(GIMP_VER).dll \ cdisplay_gamma-$(GIMP_VER).dll \
cdisplay_highcontrast-$(GIMP_VER).dll cdisplay_highcontrast-$(GIMP_VER).dll
@ -43,36 +44,44 @@ install : all
..\config.h : ..\config.h.win32 ..\config.h : ..\config.h.win32
copy ..\config.h.win32 ..\config.h copy ..\config.h.win32 ..\config.h
colorsel_gtk-$(GIMP_VER).dll : colorsel_gtk.obj module.def colorsel_gtk-$(GIMP_VER).dll : colorsel_gtk.obj
$(CC) $(CFLAGS) -LD -Fe$@ colorsel_gtk.obj $(LDFLAGS) \ $(CC) $(CFLAGS) -LD -Fe$@ colorsel_gtk.obj $(LDFLAGS) \
..\app\gimp.lib \ ..\app\gimp.lib \
..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \ ..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \
$(DEPLIBS) /def:module.def $(DEPLIBS)
colorsel_triangle-$(GIMP_VER).dll : colorsel_triangle.obj module.def colorsel_triangle-$(GIMP_VER).dll : colorsel_triangle.obj
$(CC) $(CFLAGS) -LD -Fe$@ colorsel_triangle.obj $(LDFLAGS) \ $(CC) $(CFLAGS) -LD -Fe$@ colorsel_triangle.obj $(LDFLAGS) \
..\app\gimp.lib \ ..\app\gimp.lib \
..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \ ..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \
$(DEPLIBS) /def:module.def ..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
..\libgimpmodule\gimpmodule-$(GIMP_VER).lib \
$(DEPLIBS)
colorsel_water-$(GIMP_VER).dll : colorsel_water.obj module.def colorsel_water-$(GIMP_VER).dll : colorsel_water.obj
$(CC) $(CFLAGS) -LD -Fe$@ colorsel_water.obj $(LDFLAGS) \ $(CC) $(CFLAGS) -LD -Fe$@ colorsel_water.obj $(LDFLAGS) \
..\app\gimp.lib \ ..\app\gimp.lib \
..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \ ..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \
..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \ ..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
$(DEPLIBS) /def:module.def $(DEPLIBS)
cdisplay_gamma-$(GIMP_VER).dll : cdisplay_gamma.obj module.def cdisplay_colorblind-$(GIMP_VER).dll : cdisplay_colorblind.obj
$(CC) $(CFLAGS) -LD -Fe$@ cdisplay_colorblind.obj $(LDFLAGS) ..\app\gimp.lib \
..\libgimpbase\gimpbase-$(GIMP_VER).lib \
..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
$(DEPLIBS)
cdisplay_gamma-$(GIMP_VER).dll : cdisplay_gamma.obj
$(CC) $(CFLAGS) -LD -Fe$@ cdisplay_gamma.obj $(LDFLAGS) ..\app\gimp.lib \ $(CC) $(CFLAGS) -LD -Fe$@ cdisplay_gamma.obj $(LDFLAGS) ..\app\gimp.lib \
..\libgimpbase\gimpbase-$(GIMP_VER).lib \ ..\libgimpbase\gimpbase-$(GIMP_VER).lib \
..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \ ..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
$(DEPLIBS) /def:module.def $(DEPLIBS)
cdisplay_highcontrast-$(GIMP_VER).dll : cdisplay_highcontrast.obj module.def cdisplay_highcontrast-$(GIMP_VER).dll : cdisplay_highcontrast.obj
$(CC) $(CFLAGS) -LD -Fe$@ cdisplay_highcontrast.obj $(LDFLAGS) ..\app\gimp.lib \ $(CC) $(CFLAGS) -LD -Fe$@ cdisplay_highcontrast.obj $(LDFLAGS) ..\app\gimp.lib \
..\libgimpbase\gimpbase-$(GIMP_VER).lib \ ..\libgimpbase\gimpbase-$(GIMP_VER).lib \
..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \ ..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
$(DEPLIBS) /def:module.def $(DEPLIBS)
# General rule for building # General rule for building
.c.obj: .c.obj:

3
modules/module.def
View File

@ -1,3 +0,0 @@
EXPORTS
module_init
module_unload