Add gdiplay_color. Create gimp.def from gimp.sym.

* app/makefile.{cygwin,msc}: Add gdiplay_color. Create gimp.def from gimp.sym. * app/gimp.def: Removed. * libgimp/gimpenv.c (gimp_data_directory) (Win32): Also check for the executable being in the plug-ins subdirectory. * plug-ins/makefile.{cygwin,msc}: Install also GIMPressionist brushes, papers and presets.
1999-07-29 22:07:17 +00:00
parent 9a06dbc989
commit 21aae5c7ad
8 changed files with 63 additions and 29 deletions
--- a/13
+++ b/13
@ -1,3 +1,16 @@
+Thu Jul 29 23:58:08 1999  Tor Lillqvist  <tml@iki.fi>
+
+	* app/makefile.{cygwin,msc}: Add gdiplay_color. Create gimp.def
+ 	from gimp.sym.
+
+	* app/gimp.def: Removed.
+
+	* libgimp/gimpenv.c (gimp_data_directory) (Win32): Also check for
+	the executable being in the plug-ins subdirectory.
+
+	* plug-ins/makefile.{cygwin,msc}: Install also GIMPressionist
+ 	brushes, papers and presets.
+
 Thu Jul 29 03:20:36 1999  Jay Cox  <jaycox@earthlink.net>

 	* app/paint_funcs.c, app/transform_core.c:  replace the cubic 
--- a/app/gimp.def
+++ b/app/gimp.def
@ -1,3 +0,0 @@
-EXPORTS
-	gimp_color_selector_register
-	gimp_color_selector_unregister
--- a/app/makefile.cygwin
+++ b/app/makefile.cygwin
@ -125,6 +125,7 @@ gimp_OBJECTS = \
 	fuzzy_select.o		\
 	gdisplay.o		\
 	gdisplay_cmds.o		\
+	gdisplay_color.o	\
 	gdisplay_ops.o		\
 	general.o		\
 	gimage.o		\
--- a/app/makefile.msc
+++ b/app/makefile.msc
@ -136,6 +136,7 @@ gimp_OBJECTS = \
 	fuzzy_select.obj	\
 	gdisplay.obj		\
 	gdisplay_cmds.obj	\
+	gdisplay_color.obj	\
 	gdisplay_ops.obj	\
 	general.obj		\
 	gimage.obj		\
@ -254,6 +255,10 @@ gimp_OBJECTS = \
 gimp.res : gimp.rc wilber.ico
 	rc -r -fo gimp.res gimp.rc

+gimp.def: gimp.sym
+	echo EXPORTS >$@
+	copy /y $@+gimp.sym $@
+
 gimp.exe : ..\config.h $(gimp_OBJECTS) gimpim.lib gimp.def gimp.res ..\libgimp\gimpi.lib
 	$(CC) $(CFLAGS) -Fegimp.exe $(gimp_OBJECTS) gimpim.lib ..\libgimp\gimpi.lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\win32\gdk-$(GTK_VER).lib $(GETTEXT)\intl\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(GLIB)\gmodule-$(GLIB_VER).lib $(LDFLAGS) gimp.res gdi32.lib user32.lib /def:gimp.def

--- a/libgimp/gimpenv.c
+++ b/libgimp/gimpenv.c
@ -139,8 +139,9 @@ gimp_data_directory ()
      if (GetModuleFileName (NULL, filename, sizeof (filename)) == 0)
 	g_error ("GetModuleFilename failed\n");
      
-      /* If the executable file name is of the format <foobar>\bin\gimp.exe,
-       * use <foobar>. Otherwise, use the directory where the executable
+      /* If the executable file name is of the format
+       * <foobar>\bin\gimp.exe of <foobar>\plug-ins\filter.exe, * use
+       * <foobar>. Otherwise, use the directory where the executable
       * is.
       */

@ -152,7 +153,8 @@ gimp_data_directory ()

      if (sep2 != NULL)
 	{
-	  if (g_strcasecmp (sep2 + 1, "bin") == 0)
+	  if (g_strcasecmp (sep2 + 1, "bin") == 0
+	      || g_strcasecmp (sep2 + 1, "plug-ins") == 0)
 	    *sep2 = '\0';
 	}

--- a/libgimpbase/gimpenv.c
+++ b/libgimpbase/gimpenv.c
@ -139,8 +139,9 @@ gimp_data_directory ()
      if (GetModuleFileName (NULL, filename, sizeof (filename)) == 0)
 	g_error ("GetModuleFilename failed\n");
      
-      /* If the executable file name is of the format <foobar>\bin\gimp.exe,
-       * use <foobar>. Otherwise, use the directory where the executable
+      /* If the executable file name is of the format
+       * <foobar>\bin\gimp.exe of <foobar>\plug-ins\filter.exe, * use
+       * <foobar>. Otherwise, use the directory where the executable
       * is.
       */

@ -152,7 +153,8 @@ gimp_data_directory ()

      if (sep2 != NULL)
 	{
-	  if (g_strcasecmp (sep2 + 1, "bin") == 0)
+	  if (g_strcasecmp (sep2 + 1, "bin") == 0
+	      || g_strcasecmp (sep2 + 1, "plug-ins") == 0)
 	    *sep2 = '\0';
 	}

--- a/plug-ins/makefile.cygwin
+++ b/plug-ins/makefile.cygwin
@ -49,6 +49,10 @@ install : libs-install common-plugins-install separate-plugins-install scripts-i

 unofficial:
 	for d in $(UNOFFICIAL); do $(MAKE) -f makefile.cygwin sub-one-separate DIR=$$d TARGET=install; done
+	-mkdir $(GIMP)/gimpressionist $(GIMP)/gimpressionist/Brushes $(GIMP)/gimpressionist/Paper $(GIMP)/gimpressionist/Presets
+	$(INSTALL) gimpressionist/Brushes/* $(GIMP)/gimpressionist/Brushes
+	$(INSTALL) gimpressionist/Paper/* $(GIMP)/gimpressionist/Paper
+	$(INSTALL) gimpressionist/Presets/* $(GIMP)/gimpressionist/Presets

 clean : libs-clean common-plugins-clean separate-plugins-clean

@ -108,6 +112,7 @@ sub-one-separate :


 scripts-install :
+	-mkdir $(GIMP)/scripts
 	$(INSTALL) script-fu/scripts/*.scm $(GIMP)/scripts
 	$(INSTALL) script-fu/scripts/*.jpg $(GIMP)/scripts
 	for d in FractalExplorer/fractalexplorer-examples/*; do if [ -f $$d ]; then $(INSTALL) $$d $(GIMP)/fractalexplorer; fi; done
@ -315,20 +320,22 @@ endif

 ifdef EXTRA_gimpressionist
 OBJECTS = \
-	gimpressionist.o \
-	ppmtool.o \
-	paper.o \
+	about.o \
 	brush.o \
-	orientation.o \
-	preview.o \
-	repaint.o \
 	general.o \
 	gimp.o \
-	plasma.o \
-	presets.o \
-	about.o \
+	gimpressionist.o \
+	orientation.o \
+	orientmap.o \
+	paper.o \
 	placement.o \
-	orientmap.o
+	plasma.o \
+	ppmtool.o \
+	presets.o \
+	preview.o \
+	repaint.o \
+	size.o \
+	sizemap.o
 endif

 ifdef EXTRA_guash
--- a/plug-ins/makefile.msc
+++ b/plug-ins/makefile.msc
@ -48,6 +48,10 @@ install : libs-install common-plugins-install separate-plugins-install scripts-i

 unofficial:
 	for %d in ($(UNOFFICIAL)) do nmake -nologo -f makefile.msc sub-one-separate DIR=%d TARGET=install
+	-md $(GIMP)\gimpressionist $(GIMP)\gimpressionist\Brushes $(GIMP)\gimpressionist\Paper $(GIMP)\gimpressionist\Presets
+	$(INSTALL) gimpressionist\Brushes\* $(GIMP)\gimpressionist\Brushes
+	$(INSTALL) gimpressionist\Paper\* $(GIMP)\gimpressionist\Paper
+	$(INSTALL) gimpressionist\Presets\* $(GIMP)\gimpressionist\Presets

 clean : libs-clean common-plugins-clean separate-plugins-clean

@ -121,6 +125,7 @@ sub-one-separate :


 scripts-install :
+	-md $(GIMP)\scripts
 	$(INSTALL) script-fu\scripts\*.scm $(GIMP)\scripts
 	$(INSTALL) script-fu\scripts\*.jpg $(GIMP)\scripts
 	$(INSTALL) FractalExplorer\fractalexplorer-examples\* $(GIMP)\fractalexplorer
@ -337,20 +342,22 @@ OBJECTS = \
 !IFDEF EXTRA_gimpressionist

 OBJECTS = \
-	gimpressionist.obj \
-	ppmtool.obj \
-	paper.obj \
+	about.obj \
 	brush.obj \
-	orientation.obj \
-	preview.obj \
-	repaint.obj \
 	general.obj \
 	gimp.obj \
-	plasma.obj \
-	presets.obj \
-	about.obj \
+	gimpressionist.obj \
+	orientation.obj \
+	orientmap.obj \
+	paper.obj \
 	placement.obj \
-	orientmap.obj
+	plasma.obj \
+	ppmtool.obj \
+	presets.obj \
+	preview.obj \
+	repaint.obj \
+	size.obj \
+	sizemap.obj
 !ENDIF

 !IFDEF EXTRA_guash