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

Makefile.am configure.in added stuff for the new library below. 

2001-01-23  Michael Natterer  <mitch@gimp.org>

	* Makefile.am
	* configure.in
	* gimptool.in: added stuff for the new library below.

	* libgimpcolor/.cvsignore
	* libgimpcolor/Makefile.am
	* libgimpcolor/gimpcolor.h
	* libgimpcolor/gimpcolorspace.c
	* libgimpcolor/gimpcolorspace.h
	* libgimpcolor/gimpcolortypes.h
	* libgimpcolor/gimphsv.c
	* libgimpcolor/gimphsv.h
	* libgimpcolor/gimprgb.c
	* libgimpcolor/gimprgb.h: new shared library which both the app
	and plug-ins link against. The library depends only on glib.

	* libgimpcolor/gimpcolor.def
	* libgimpcolor/makefile.mingw.in
	* libgimpcolor/makefile.msc: added Win32 build files which
	definitely don't work.

	* libgimp/Makefile.am
	* libgimp/gimpcolor.[ch]
	* libgimp/gimpcolorspace.[ch]: removed.

	* libgimp/gimp.h
	* libgimp/gimpadaptivesupersample.c
	* libgimp/gimpbilinear.c
	* libgimp/gimppalette.c
	* libgimp/gimptypes.h: include the stuff from libgimpcolor.

	Plug-Ins don't need to include <libgimpcolor/gimpcolor.h>
	explicitely. LibGimp depends on libgimpcolor and thus also includes
	it's headers.

	* libgimp/gimp.def
	* libgimp/makefile.mingw.in: fiddled around with Win32 stuff...

	* app/Makefile.am: link against libgimpcolor.la

	* app/apptypes.h: include "libgimpcolor/gimpcolortypes.h"

	* app/asupsample.c
	* app/channels_dialog.c
	* app/colormap_dialog.c
	* app/commands.c
	* app/convert.c
	* app/devices.c
	* app/disp_callbacks.c
	* app/drawable.c
	* app/gimpcontext.c
	* app/gimpdnd.c
	* app/gimpimage.c
	* app/gimppalette.c
	* app/gimprc.c
	* app/gradient.c
	* app/libgimp_glue.c
	* app/palette.c
	* app/palette_import.c
	* app/qmask.c
	* app/xcf.c
	* app/tools/paint_core.c
	* app/tools/paintbrush.c
	* app/tools/pencil.c: include "libgimpcolor/gimpcolor.h" before all
	gimp includes because it's a standalone library.

	* plug-ins/FractalExplorer/Makefile.am
	* plug-ins/Lighting/Makefile.am
	* plug-ins/MapObject/Makefile.am
	* plug-ins/bmp/Makefile.am
	* plug-ins/common/Makefile.am
	* plug-ins/common/mkgen.pl
	* plug-ins/dbbrowser/Makefile.am
	* plug-ins/faxg3/Makefile.am
	* plug-ins/fits/Makefile.am
	* plug-ins/flame/Makefile.am
	* plug-ins/fp/Makefile.am
	* plug-ins/gap/Makefile.am
	* plug-ins/gdyntext/Makefile.am
	* plug-ins/gfig/Makefile.am
	* plug-ins/gflare/Makefile.am
	* plug-ins/gfli/Makefile.am
	* plug-ins/gimpressionist/Makefile.am
	* plug-ins/helpbrowser/Makefile.am
	* plug-ins/ifscompose/Makefile.am
	* plug-ins/imagemap/Makefile.am
	* plug-ins/maze/Makefile.am
	* plug-ins/mosaic/Makefile.am
	* plug-ins/pagecurl/Makefile.am
	* plug-ins/print/Makefile.am
	* plug-ins/rcm/Makefile.am
	* plug-ins/script-fu/Makefile.am
	* plug-ins/sel2path/Makefile.am
	* plug-ins/sgi/Makefile.am
	* plug-ins/webbrowser/Makefile.am
	* plug-ins/xjt/Makefile.am: add libgimpcolor.la to LDADD.

	* INSTALL: don't recommend to --disable-shared for development.

	* TODO.xml: increased some percentages, added plug-in help stuff.
This commit is contained in:
Michael Natterer 2001-01-23 18:49:44 +00:00 committed by Michael Natterer
parent b346ba965d
commit e803beddd4
126 changed files with 1556 additions and 604 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
ChangeLog
View File

@ -1,3 +1,106 @@
2001-01-23 Michael Natterer <mitch@gimp.org>
* Makefile.am
* configure.in
* gimptool.in: added stuff for the new library below.
* libgimpcolor/.cvsignore
* libgimpcolor/Makefile.am
* libgimpcolor/gimpcolor.h
* libgimpcolor/gimpcolorspace.c
* libgimpcolor/gimpcolorspace.h
* libgimpcolor/gimpcolortypes.h
* libgimpcolor/gimphsv.c
* libgimpcolor/gimphsv.h
* libgimpcolor/gimprgb.c
* libgimpcolor/gimprgb.h: new shared library which both the app
and plug-ins link against. The library depends only on glib.
* libgimpcolor/gimpcolor.def
* libgimpcolor/makefile.mingw.in
* libgimpcolor/makefile.msc: added Win32 build files which
definitely don't work.
* libgimp/Makefile.am
* libgimp/gimpcolor.[ch]
* libgimp/gimpcolorspace.[ch]: removed.
* libgimp/gimp.h
* libgimp/gimpadaptivesupersample.c
* libgimp/gimpbilinear.c
* libgimp/gimppalette.c
* libgimp/gimptypes.h: include the stuff from libgimpcolor.
Plug-Ins don't need to include <libgimpcolor/gimpcolor.h>
explicitely. LibGimp depends on libgimpcolor and thus also includes
it's headers.
* libgimp/gimp.def
* libgimp/makefile.mingw.in: fiddled around with Win32 stuff...
* app/Makefile.am: link against libgimpcolor.la
* app/apptypes.h: include "libgimpcolor/gimpcolortypes.h"
* app/asupsample.c
* app/channels_dialog.c
* app/colormap_dialog.c
* app/commands.c
* app/convert.c
* app/devices.c
* app/disp_callbacks.c
* app/drawable.c
* app/gimpcontext.c
* app/gimpdnd.c
* app/gimpimage.c
* app/gimppalette.c
* app/gimprc.c
* app/gradient.c
* app/libgimp_glue.c
* app/palette.c
* app/palette_import.c
* app/qmask.c
* app/xcf.c
* app/tools/paint_core.c
* app/tools/paintbrush.c
* app/tools/pencil.c: include "libgimpcolor/gimpcolor.h" before all
gimp includes because it's a standalone library.
* plug-ins/FractalExplorer/Makefile.am
* plug-ins/Lighting/Makefile.am
* plug-ins/MapObject/Makefile.am
* plug-ins/bmp/Makefile.am
* plug-ins/common/Makefile.am
* plug-ins/common/mkgen.pl
* plug-ins/dbbrowser/Makefile.am
* plug-ins/faxg3/Makefile.am
* plug-ins/fits/Makefile.am
* plug-ins/flame/Makefile.am
* plug-ins/fp/Makefile.am
* plug-ins/gap/Makefile.am
* plug-ins/gdyntext/Makefile.am
* plug-ins/gfig/Makefile.am
* plug-ins/gflare/Makefile.am
* plug-ins/gfli/Makefile.am
* plug-ins/gimpressionist/Makefile.am
* plug-ins/helpbrowser/Makefile.am
* plug-ins/ifscompose/Makefile.am
* plug-ins/imagemap/Makefile.am
* plug-ins/maze/Makefile.am
* plug-ins/mosaic/Makefile.am
* plug-ins/pagecurl/Makefile.am
* plug-ins/print/Makefile.am
* plug-ins/rcm/Makefile.am
* plug-ins/script-fu/Makefile.am
* plug-ins/sel2path/Makefile.am
* plug-ins/sgi/Makefile.am
* plug-ins/webbrowser/Makefile.am
* plug-ins/xjt/Makefile.am: add libgimpcolor.la to LDADD.
* INSTALL: don't recommend to --disable-shared for development.
* TODO.xml: increased some percentages, added plug-in help stuff.
2001-01-23 Michael Natterer <mitch@gimp.org>
* app/Makefile.am

6
INSTALL
View File

@ -42,10 +42,8 @@ recognizes. These are:
1. --enable-shared and --disable-shared. This option affects whether
shared libraries will be built or not. Shared libraries provide
for much smaller executables, but they are difficult to debug
with. If you are interested in doing development, it is probably
wise to specify `--disable-shared'. The default is to enable
shared libraries.
for much smaller executables. The default is to enable shared
libraries. Disabling shared libraries is almost never a good idea.
2. --enable-debug and --disable-debug. This option causes the build
process to compile with debugging enabled. If debugging is

1
Makefile.am
View File

@ -3,6 +3,7 @@
SUBDIRS = \
tools \
intl \
libgimpcolor \
libgimp \
app \
$(GIMP_PLUGINS) \

36
TODO.xml
View File

@ -173,7 +173,7 @@
<section>
<title>LibGimp</title>
<entry size="medium" difficulty="medium" status="0%" target="1.4">
<entry size="medium" difficulty="medium" status="10%" target="1.4">
<title>Restructure LibGimp</title>
<description>
<p>
@ -187,7 +187,7 @@
</contact>
</entry>
<entry size="small" difficulty="easy" status="0%" target="1.4">
<entry size="small" difficulty="easy" status="20%" target="1.4">
<title>Utility library</title>
<description>
<p>
@ -213,7 +213,7 @@
</contact>
</entry>
<entry size="medium" difficulty="medium" status="80%" target="1.4">
<entry size="medium" difficulty="medium" status="90%" target="1.4">
<title>Move GCK functionality into LibGimp</title>
<description>
<p>
@ -399,13 +399,37 @@
</contact>
</entry>
</section> <!-- User Interface -->
</section> <!-- User Interface -->
<section>
<title>Help System</title>
<entry size="medium" difficulty="medium" status="0%" target="1.4">
<title>Rethink Plug-In and Script Help</title>
<description>
<p>
Currently a Plug-In's help file determined by the application
from it's executable name. This is broken because is does not
cover multiple PDB procedures implemented in one Plug-In.
</p>
<p>
A possible solution would be to pass the relative path to the
help file to gimp_install_procedure(). A similar fix should be
applied to Script-Fu and Perl.
</p>
</description>
<contact>
GIMP Developer List &lt;gimp-developer@xcf.berkeley.edu&gt;
</contact>
</entry>
</section> <!-- Help System -->
<section>
<title>Internationalization</title>
<entry size="small" difficulty="medium" status="0%" target="1.4">
<title>Context-sensitive translations</title>
<title>Context-Sensitive Translations</title>
<description>
<p>
The same english string used in different contexts may need to

13
app/Makefile.am
View File

@ -309,12 +309,13 @@ INCLUDES = \
-I$(includedir)
gimp_LDADD = \
pdb/libapppdb.la \
tools/libapptools.la \
$(top_builddir)/libgimp/libgimpi.a \
$(GTK_LIBS) \
$(GIMP_THREAD_LIBS) \
$(GIMP_MP_LIBS) \
pdb/libapppdb.la \
tools/libapptools.la \
$(top_builddir)/libgimpcolor/libgimpcolor.la \
$(top_builddir)/libgimp/libgimpi.a \
$(GTK_LIBS) \
$(GIMP_THREAD_LIBS) \
$(GIMP_MP_LIBS) \
$(INTLLIBS)
.PHONY: files

2
app/actions/help-commands.c
View File

@ -23,6 +23,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/actions/qmask-commands.c
View File

@ -24,6 +24,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/actions/quick-mask-commands.c
View File

@ -24,6 +24,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

10
app/apptypes.h
View File

@ -20,15 +20,17 @@
#define __APPTYPES_H__
#include "undo_types.h"
#include "libgimpcolor/gimpcolortypes.h"
#include "libgimp/gimpuitypes.h"
/* these will go into a general purpose library */
#include "libgimp/gimpcolor.h"
/* stuff that will go to general-purpose libraries */
#include "libgimp/gimpmatrix.h"
#include "libgimp/gimpvector.h"
#include "libgimp/gimpunit.h"
#include "libgimp/gimpuitypes.h"
#include "undo_types.h"
#include "appenums.h"

2
app/asupsample.c
View File

@ -33,6 +33,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/channels_dialog.c
View File

@ -21,6 +21,8 @@
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/colormap_dialog.c
View File

@ -25,6 +25,8 @@
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "color_notebook.h"

2
app/commands.c
View File

@ -23,6 +23,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/convert.c
View File

@ -91,6 +91,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/core/gimpcontext.c
View File

@ -22,6 +22,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/core/gimpimage-convert.c
View File

@ -91,6 +91,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/core/gimpimage-guides.c
View File

@ -22,6 +22,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "channel.h"

2
app/core/gimpimage-merge.c
View File

@ -22,6 +22,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "channel.h"

2
app/core/gimpimage-projection.c
View File

@ -22,6 +22,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "channel.h"

2
app/core/gimpimage-qmask.c
View File

@ -24,6 +24,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/core/gimpimage-quick-mask.c
View File

@ -24,6 +24,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/core/gimpimage-resize.c
View File

@ -22,6 +22,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "channel.h"

2
app/core/gimpimage-scale.c
View File

@ -22,6 +22,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "channel.h"

2
app/core/gimpimage.c
View File

@ -22,6 +22,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "channel.h"

2
app/core/gimppalette-load.c
View File

@ -27,6 +27,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "gimppalette.h"

2
app/core/gimppalette-save.c
View File

@ -27,6 +27,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "gimppalette.h"

2
app/core/gimppalette.c
View File

@ -27,6 +27,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "gimppalette.h"

2
app/core/gimpprojection-construct.c
View File

@ -22,6 +22,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "channel.h"

2
app/devices.c
View File

@ -23,6 +23,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/dialogs/palette-import-dialog.c
View File

@ -20,6 +20,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/disp_callbacks.c
View File

@ -23,6 +23,8 @@
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/display/gimpdisplay-callbacks.c
View File

@ -23,6 +23,8 @@
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/display/gimpdisplayshell-callbacks.c
View File

@ -23,6 +23,8 @@
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/display/gimpdisplayshell-qmask.c
View File

@ -24,6 +24,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/drawable.c
View File

@ -20,6 +20,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "drawable.h"

2
app/gimpcontext.c
View File

@ -22,6 +22,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

5
app/gimpdnd.c
View File

@ -22,6 +22,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "channel.h"
@ -44,10 +46,11 @@
#include "libgimp/gimplimits.h"
#include "libgimp/gimpcolorarea.h"
#define DRAG_PREVIEW_SIZE 32
#define DRAG_PREVIEW_SIZE 32
#define DRAG_ICON_OFFSET -8
typedef enum
{
GIMP_DND_DATA_COLOR = 1,

2
app/gimpimage-convert.c
View File

@ -91,6 +91,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/gimpimage.c
View File

@ -22,6 +22,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "channel.h"

2
app/gimppalette.c
View File

@ -27,6 +27,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "gimppalette.h"

2
app/gimprc.c
View File

@ -33,6 +33,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "app_procs.h"

2
app/gradient.c
View File

@ -57,6 +57,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/gradient_editor.c
View File

@ -57,6 +57,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/gui/channels-dialog.c
View File

@ -21,6 +21,8 @@
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/gui/colormap-dialog.c
View File

@ -25,6 +25,8 @@
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "color_notebook.h"

2
app/gui/commands.c
View File

@ -23,6 +23,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/gui/device-status-dialog.c
View File

@ -23,6 +23,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/gui/gradient-editor.c
View File

@ -57,6 +57,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/gui/help-commands.c
View File

@ -23,6 +23,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/gui/input-dialog.c
View File

@ -23,6 +23,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/gui/palette-editor.c
View File

@ -23,6 +23,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "color_area.h"

2
app/gui/palette-import-dialog.c
View File

@ -20,6 +20,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/gui/qmask-commands.c
View File

@ -24,6 +24,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/libgimp_glue.c
View File

@ -20,6 +20,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "gimpcontext.h"

2
app/paint/gimppencil.c
View File

@ -20,6 +20,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/palette.c
View File

@ -23,6 +23,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "color_area.h"

2
app/palette_import.c
View File

@ -20,6 +20,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/qmask.c
View File

@ -24,6 +24,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/tools/gimppenciltool.c
View File

@ -20,6 +20,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/tools/paint_core.c
View File

@ -23,6 +23,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/tools/paintbrush.c
View File

@ -20,6 +20,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/tools/pencil.c
View File

@ -20,6 +20,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/widgets/gimpcolormapeditor.c
View File

@ -25,6 +25,8 @@
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "color_notebook.h"

2
app/widgets/gimpdeviceinfo.c
View File

@ -23,6 +23,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/widgets/gimpdevices.c
View File

@ -23,6 +23,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

5
app/widgets/gimpdnd.c
View File

@ -22,6 +22,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "channel.h"
@ -44,10 +46,11 @@
#include "libgimp/gimplimits.h"
#include "libgimp/gimpcolorarea.h"
#define DRAG_PREVIEW_SIZE 32
#define DRAG_PREVIEW_SIZE 32
#define DRAG_ICON_OFFSET -8
typedef enum
{
GIMP_DND_DATA_COLOR = 1,

2
app/widgets/gimpgradienteditor.c
View File

@ -57,6 +57,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "appenv.h"

2
app/widgets/gimppaletteeditor.c
View File

@ -23,6 +23,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "color_area.h"

2
app/xcf.c
View File

@ -33,6 +33,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "channel.h"

2
app/xcf/xcf.c
View File

@ -33,6 +33,8 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "channel.h"

2
configure.in
View File

@ -732,6 +732,8 @@ gimp.spec
libgimp/gimpfeatures.h
libgimp/Makefile
libgimp/makefile.mingw
libgimpcolor/Makefile
libgimpcolor/makefile.mingw
app/Makefile
app/makefile.mingw
app/pdb/Makefile

4
gimptool-1.2.in
View File

@ -203,9 +203,9 @@ while test $# -gt 0; do
done
case $1 in
--libs)
echo $libdirs -lgimpui -lgimp $my_gtk_libs ;;
echo $libdirs -lgimpui -lgimp -lgimpcolor $my_gtk_libs ;;
--libs-nogimpui)
echo $libdirs -lgimp $my_gtk_libs ;;
echo $libdirs -lgimp -lgimpcolor $my_gtk_libs ;;
esac
;;
--libs-noui)

4
gimptool.in
View File

@ -203,9 +203,9 @@ while test $# -gt 0; do
done
case $1 in
--libs)
echo $libdirs -lgimpui -lgimp $my_gtk_libs ;;
echo $libdirs -lgimpui -lgimp -lgimpcolor $my_gtk_libs ;;
--libs-nogimpui)
echo $libdirs -lgimp $my_gtk_libs ;;
echo $libdirs -lgimp -lgimpcolor $my_gtk_libs ;;
esac
;;
--libs-noui)

10
libgimp/Makefile.am
View File

@ -97,16 +97,12 @@ PDB_WRAPPERS_H = \
gimpunit_pdb.h
libgimpi_a_SOURCES = \
gimpcolor.c \
gimpcolor.h \
gimpchainbutton.c \
gimpchainbutton.h \
gimpcolorarea.c \
gimpcolorarea.h \
gimpcolorbutton.c \
gimpcolorbutton.h \
gimpcolorspace.c \
gimpcolorspace.h \
gimpdialog.c \
gimpdialog.h \
gimpenv.c \
@ -163,10 +159,6 @@ libgimp_la_SOURCES = \
gimpadaptivesupersample.h \
gimpbilinear.c \
gimpbilinear.h \
gimpcolor.c \
gimpcolor.h \
gimpcolorspace.c \
gimpcolorspace.h \
gimpchannel.c \
gimpchannel.h \
gimpdrawable.c \
@ -240,12 +232,10 @@ gimpinclude_HEADERS = \
gimpbilinear.h \
gimpchainbutton.h \
gimpchannel.h \
gimpcolor.h \
gimpcolorarea.h \
gimpcolorbutton.h \
gimpcolordisplay.h \
gimpcolorselector.h \
gimpcolorspace.h \
gimpcompat.h \
gimpdrawable.h \
gimpdialog.h \

9
libgimp/gimp.def
View File

@ -137,10 +137,6 @@ EXPORTS
gimp_gradients_set_popup
gimp_gtkrc
gimp_help
gimp_hls_to_rgb
gimp_hsv_to_rgb
gimp_hsv_to_rgb4
gimp_hsv_to_rgb_double
gimp_image_add_channel
gimp_image_add_hguide
gimp_image_add_layer
@ -325,11 +321,6 @@ EXPORTS
gimp_register_load_handler
gimp_register_magic_load_handler
gimp_register_save_handler
gimp_rgb_to_hls
gimp_rgb_to_hsv
gimp_rgb_to_hsv4
gimp_rgb_to_hsv_double
gimp_rgb_to_l
gimp_rotate
gimp_run_procedure
gimp_run_procedure2

4
libgimp/gimp.h
View File

@ -24,14 +24,14 @@
#include <glib.h>
#include <libgimpcolor/gimpcolor.h>
#include <libgimp/gimpenums.h>
#include <libgimp/gimptypes.h>
#include <libgimp/gimpadaptivesupersample.h>
#include <libgimp/gimpbilinear.h>
#include <libgimp/gimpchannel.h>
#include <libgimp/gimpcolor.h>
#include <libgimp/gimpcolorspace.h>
#include <libgimp/gimpdrawable.h>
#include <libgimp/gimpfeatures.h>
#include <libgimp/gimpgradientselect.h>

3
libgimp/gimpadaptivesupersample.c
View File

@ -21,7 +21,8 @@
#include <glib.h>
#include "gimpcolor.h"
#include "libgimpcolor/gimpcolor.h"
#include "gimpadaptivesupersample.h"
#include "gimpmath.h"

3
libgimp/gimpbilinear.c
View File

@ -21,7 +21,8 @@
#include <glib.h>
#include "gimpcolor.h"
#include "libgimpcolor/gimpcolor.h"
#include "gimpbilinear.h"
#include "gimpmath.h"

3
libgimp/gimppalette.c
View File

@ -21,7 +21,8 @@
#include <glib.h>
#include "gimpcolor.h"
#include "libgimpcolor/gimpcolor.h"
#include "gimppalette_pdb.h"

4
libgimp/gimptypes.h
View File

@ -23,8 +23,10 @@
#define __GIMP_TYPES_H__
#include <libgimpcolor/gimpcolortypes.h>
/* these will go to a separate library soon */
#include "gimpcolor.h"
#include "gimpunit.h"

2
libgimp/makefile.mingw.in
View File

@ -66,7 +66,6 @@ gimpi_OBJECTS = \
gimpenv.o \
gimpchainbutton.o \
gimpcolorbutton.o \
gimpcolorspace.o \
gimpdialog.o \
gimpfileselection.o \
gimphelpui.o \
@ -91,7 +90,6 @@ gimp_OBJECTS = \
gimp.o \
$(PDB_WRAPPERS_O) \
gimpchannel.o \
gimpcolorspace.o \
gimpdrawable.o \
gimpenv.o \
gimpgradientselect.o \

8
libgimpcolor/.cvsignore Normal file
View File

@ -0,0 +1,8 @@
Makefile
Makefile.in
makefile.mingw
*.lo
_libs
.libs
.deps
*.la

57
libgimpcolor/Makefile.am Normal file
View File

@ -0,0 +1,57 @@
## Process this file with automake to produce Makefile.in
libgimpcolorincludedir = $(includedir)/libgimpcolor
AM_CPPFLAGS = \
-DGIMPDIR=\""$(gimpdir)"\" \
-DDATADIR=\""$(gimpdatadir)"\" \
-DSYSCONFDIR=\""$(gimpsysconfdir)"\" \
-DG_LOG_DOMAIN=\"LibGimpColor\" \
@GIMP_THREAD_FLAGS@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/intl \
-I../intl \
$(GTK_CFLAGS) \
-I$(includedir)
EXTRA_DIST = \
makefile.mingw \
makefile.mingw.in \
makefile.msc \
gimpcolor.def
lib_LTLIBRARIES = libgimpcolor.la
libgimpcolor_la_SOURCES = \
gimpcolor.h \
gimpcolortypes.h \
gimpcolorspace.c \
gimpcolorspace.h \
gimphsv.c \
gimphsv.h \
gimprgb.c \
gimprgb.h
libgimpcolorinclude_HEADERS = \
gimpcolor.h \
gimpcolortypes.h \
gimpcolorspace.h \
gimphsv.h \
gimprgb.h
libgimpcolor_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-release $(LT_RELEASE)
libgimpcolor_la_LIBADD = $(GLIB_LIBS) -lm
.PHONY: files
files:
@files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \
echo $$p; \
done
makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/libgimpcolor/makefile.mingw.in
cd $(top_builddir) && CONFIG_FILES=libgimpcolor/$@ CONFIG_HEADERS= $(SHELL) ./config.status

3
libgimpcolor/gimpadaptivesupersample.c
View File

@ -21,7 +21,8 @@
#include <glib.h>
#include "gimpcolor.h"
#include "libgimpcolor/gimpcolor.h"
#include "gimpadaptivesupersample.h"
#include "gimpmath.h"

3
libgimpcolor/gimpbilinear.c
View File

@ -21,7 +21,8 @@
#include <glib.h>
#include "gimpcolor.h"
#include "libgimpcolor/gimpcolor.h"
#include "gimpbilinear.h"
#include "gimpmath.h"

10
libgimpcolor/gimpcolor.def Normal file
View File

@ -0,0 +1,10 @@
EXPORTS
gimp_hls_to_rgb
gimp_hsv_to_rgb
gimp_hsv_to_rgb4
gimp_hsv_to_rgb_double
gimp_rgb_to_hls
gimp_rgb_to_hsv
gimp_rgb_to_hsv4
gimp_rgb_to_hsv_double
gimp_rgb_to_l

31
libgimpcolor/gimpcolor.h Normal file
View File

@ -0,0 +1,31 @@
/* LIBGIMP - The GIMP Library
* Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef __GIMP_COLOR_H__
#define __GIMP_COLOR_H__
#include <libgimpcolor/gimpcolortypes.h>
#include <libgimpcolor/gimpcolorspace.h>
#include <libgimpcolor/gimphsv.h>
#include <libgimpcolor/gimprgb.h>
#endif /* __GIMP_COLOR_H__ */

10
libgimp/gimpcolorspace.c → libgimpcolor/gimpcolorspace.c
View File

@ -17,11 +17,17 @@
* Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include <glib.h>
#include "gimpcolor.h"
#include "gimpcolortypes.h"
#include "gimpcolorspace.h"
#include "gimpmath.h"
#include "gimprgb.h"
#include "gimphsv.h"
#include "libgimp/gimpmath.h"
#define GIMP_HSV_UNDEFINED -1.0

10
libgimp/gimpcolorspace.h → libgimpcolor/gimpcolorspace.h
View File

@ -97,16 +97,6 @@ void gimp_hsv_to_rgb4 (guchar *rgb,
gdouble value);
/* Map RGB to intensity */
#define INTENSITY_RED 0.30
#define INTENSITY_GREEN 0.59
#define INTENSITY_BLUE 0.11
#define INTENSITY(r,g,b) ((r) * INTENSITY_RED + \
(g) * INTENSITY_GREEN + \
(b) * INTENSITY_BLUE + 0.001)
#ifdef __cplusplus
}
#endif /* __cplusplus */

54
libgimpcolor/gimpcolortypes.h Normal file
View File

@ -0,0 +1,54 @@
/* LIBGIMP - The GIMP Library
* Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef __GIMP_COLOR_TYPES_H__
#define __GIMP_COLOR_TYPES_H__
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/* For information look into the C source or the html documentation */
/* usually we don't keep the structure definitions in the types file
* but GimpRGB appears in too many header files...
*/
typedef struct _GimpRGB GimpRGB;
struct _GimpRGB
{
gdouble r, g, b, a;
};
typedef struct _GimpHSV GimpHSV;
struct _GimpHSV
{
gdouble h, s, v, a;
};
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __GIMP_COLOR_TYPES_H__ */

72
libgimpcolor/gimphsv.c Normal file
View File

@ -0,0 +1,72 @@
/* LIBGIMP - The GIMP Library
* Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include <glib.h>
#include "gimpcolortypes.h"
#include "gimphsv.h"
/* HSV functions */
void
gimp_hsv_set (GimpHSV *hsv,
gdouble h,
gdouble s,
gdouble v)
{
g_return_if_fail (hsv != NULL);
hsv->h = h;
hsv->s = s;
hsv->v = v;
}
void
gimp_hsv_clamp (GimpHSV *hsv)
{
g_return_if_fail (hsv != NULL);
hsv->h -= (gint) hsv->h;
if (hsv->h < 0)
hsv->h += 1.0;
hsv->s = CLAMP (hsv->s, 0.0, 1.0);
hsv->v = CLAMP (hsv->v, 0.0, 1.0);
hsv->a = CLAMP (hsv->a, 0.0, 1.0);
}
void
gimp_hsva_set (GimpHSV *hsva,
gdouble h,
gdouble s,
gdouble v,
gdouble a)
{
g_return_if_fail (hsva != NULL);
hsva->h = h;
hsva->s = s;
hsva->v = v;
hsva->a = a;
}

47
libgimpcolor/gimphsv.h Normal file
View File

@ -0,0 +1,47 @@
/* LIBGIMP - The GIMP Library
* Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef __GIMP_HSV_H__
#define __GIMP_HSV_H__
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/* For information look into the C source or the html documentation */
void gimp_hsv_set (GimpHSV *hsv,
gdouble h,
gdouble s,
gdouble v);
void gimp_hsv_clamp (GimpHSV *hsv);
void gimp_hsva_set (GimpHSV *hsva,
gdouble h,
gdouble s,
gdouble v,
gdouble a);
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __GIMP_HSV_H__ */

57
libgimp/gimpcolor.c → libgimpcolor/gimprgb.c
View File

@ -21,15 +21,11 @@
#include <glib.h>
#include "gimpcolor.h"
#include "gimpcolorspace.h"
#include "gimppalette_pdb.h"
#include "gimpmath.h"
#include "gimpcolortypes.h"
#include "gimprgb.h"
/***************************
* channels operations *
***************************/
#include "libgimp/gimpmath.h"
/* RGB functions */
@ -322,50 +318,3 @@ gimp_rgba_distance (const GimpRGB *rgba1,
return (fabs (rgba1->r - rgba2->r) + fabs (rgba1->g - rgba2->g) +
fabs (rgba1->b - rgba2->b) + fabs (rgba1->a - rgba2->a));
}
/* HSV functions */
void
gimp_hsv_set (GimpHSV *hsv,
gdouble h,
gdouble s,
gdouble v)
{
g_return_if_fail (hsv != NULL);
hsv->h = h;
hsv->s = s;
hsv->v = v;
}
void
gimp_hsv_clamp (GimpHSV *hsv)
{
g_return_if_fail (hsv != NULL);
hsv->h -= (gint) hsv->h;
if (hsv->h < 0)
hsv->h += 1.0;
hsv->s = CLAMP (hsv->s, 0.0, 1.0);
hsv->v = CLAMP (hsv->v, 0.0, 1.0);
hsv->a = CLAMP (hsv->a, 0.0, 1.0);
}
void
gimp_hsva_set (GimpHSV *hsva,
gdouble h,
gdouble s,
gdouble v,
gdouble a)
{
g_return_if_fail (hsva != NULL);
hsva->h = h;
hsva->s = s;
hsva->v = v;
hsva->a = a;
}

37
libgimp/gimpcolor.h → libgimpcolor/gimprgb.h
View File

@ -17,8 +17,8 @@
* Boston, MA 02111-1307, USA.
*/
#ifndef __GIMP_COLOR_H__
#define __GIMP_COLOR_H__
#ifndef __GIMP_RGB_H__
#define __GIMP_RGB_H__
#ifdef __cplusplus
extern "C" {
@ -29,19 +29,6 @@ extern "C" {
/* RGB and RGBA color types and operations taken from LibGCK */
typedef struct _GimpRGB GimpRGB;
struct _GimpRGB
{
gdouble r, g, b, a;
};
typedef struct _GimpHSV GimpHSV;
struct _GimpHSV
{
gdouble h, s, v, a;
};
typedef enum
{
@ -111,21 +98,19 @@ void gimp_rgba_multiply (GimpRGB *rgba,
gdouble gimp_rgba_distance (const GimpRGB *rgba1,
const GimpRGB *rgba2);
void gimp_hsv_set (GimpHSV *hsv,
gdouble h,
gdouble s,
gdouble v);
void gimp_hsv_clamp (GimpHSV *hsv);
void gimp_hsva_set (GimpHSV *hsva,
gdouble h,
gdouble s,
gdouble v,
gdouble a);
/* Map RGB to intensity */
#define INTENSITY_RED 0.30
#define INTENSITY_GREEN 0.59
#define INTENSITY_BLUE 0.11
#define INTENSITY(r,g,b) ((r) * INTENSITY_RED + \
(g) * INTENSITY_GREEN + \
(b) * INTENSITY_BLUE + 0.001)
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __GIMP_COLOR_H__ */
#endif /* __GIMP_RGB_H__ */

148
libgimpcolor/makefile.mingw.in Normal file
View File

@ -0,0 +1,148 @@
## Makefile for building the GIMP DLLs and LIBs with gcc on Win32.
## You should use GNU make running on cygwin.
## Use: make -f makefile.mingw
TOP = ../..
include ../build/win32/make.mingw
# Possibly override GIMP version from build/win32/module.defs
GIMP_VER = @GIMP_MAJOR_VERSION@.@GIMP_MINOR_VERSION@
################################################################
# The name of the directory in your %HOME% where the GIMP's personal settings
# and stuff is saved.
GIMPDIR = _gimp$(GIMP_VER)
INCLUDES = -I ..
DEPCFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(INTL_CFLAGS)
DEFINES = -DGIMPDIR=\"$(GIMPDIR)\" -DG_LOG_DOMAIN=\"LibGimp\"
all : \
../config.h \
libgimpi.a \
gimp-$(GIMP_VER).dll \
gimpui-$(GIMP_VER).dll
../config.h : ../config.h.win32
cp $< $@
PDB_WRAPPERS_O = \
gimpbrushes_pdb.o \
gimpbrushselect_pdb.o \
gimpchannel_pdb.o \
gimpchannelops_pdb.o \
gimpcolor_pdb.o \
gimpconvert_pdb.o \
gimpdisplay_pdb.o \
gimpdrawable_pdb.o \
gimpedit_pdb.o \
gimpfileops_pdb.o \
gimpfloatingsel_pdb.o \
gimpgimprc_pdb.o \
gimpgradients_pdb.o \
gimpgradientselect_pdb.o \
gimpguides_pdb.o \
gimphelp_pdb.o \
gimpimage_pdb.o \
gimplayer_pdb.o \
gimpmessage_pdb.o \
gimpmisc_pdb.o \
gimppalette_pdb.o \
gimpparasite_pdb.o \
gimppaths_pdb.o \
gimppatterns_pdb.o \
gimppatternselect_pdb.o \
gimpplugin_pdb.o \
gimpproceduraldb_pdb.o \
gimpselection_pdb.o \
gimptexttool_pdb.o \
gimptools_pdb.o \
gimpundo_pdb.o \
gimpunit_pdb.o
gimpi_OBJECTS = \
gimpenv.o \
gimpchainbutton.o \
gimpcolorbutton.o \
gimpcolorspace.o \
gimpdialog.o \
gimpfileselection.o \
gimphelpui.o \
gimpmatrix.o \
gimpparasite.o \
gimpparasiteio.o \
gimppatheditor.o \
gimppixmap.o \
gimpprotocol.o \
gimpquerybox.o \
gimpsizeentry.o \
gimpunitmenu.o \
gimputils.o \
gimpvector.o \
gimpwidgets.o \
gimpwire.o
libgimpi.a : $(gimpi_OBJECTS)
ar cr libgimpi.a $(gimpi_OBJECTS)
gimp_OBJECTS = \
gimp.o \
$(PDB_WRAPPERS_O) \
gimpchannel.o \
gimpcolorspace.o \
gimpdrawable.o \
gimpenv.o \
gimpgradientselect.o \
gimphelp.o \
gimpimage.o \
gimplayer.o \
gimpmatrix.o \
gimpparasite.o \
gimpparasiteio.o \
gimppixelrgn.o \
gimpproceduraldb.o \
gimpprotocol.o \
gimpselection.o \
gimptile.o \
gimpunit.o \
gimpvector.o \
gimpwire.o
gimp-$(GIMP_VER).dll : $(gimp_OBJECTS) gimp.def
$(GLIB)/build-dll gimp $(GIMP_VER) gimp.def -s $(gimp_OBJECTS) $(INTL_LIBS) $(GLIB_LIBS) -luser32
# Pass -DLIBGIMP_COMPILATION when compiling gimp.c which
# defines the exported variables.
gimp.o : gimp.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimp.c
gimpui_OBJECTS = \
gimpmenu.o \
gimpbrushmenu.o \
gimpchainbutton.o \
gimpcolorbutton.o \
gimpdialog.o \
gimpexport.o \
gimpfileselection.o \
gimphelpui.o \
gimpgradientmenu.o \
gimppatheditor.o \
gimppatternmenu.o \
gimppixmap.o \
gimpquerybox.o \
gimpsizeentry.o \
gimpui.o \
gimpunitmenu.o \
gimpwidgets.o
gimpui-$(GIMP_VER).dll : $(gimpui_OBJECTS) gimpui.def
$(GLIB)/build-dll gimpui $(GIMP_VER) gimpui.def -s $(gimpui_OBJECTS) -L . -lgimp-$(GIMP_VER) $(GTK_LIBS) $(INTL_LIBS) $(GLIB_LIBS)
# Hack to get an updated makefile.mingw automatically after updating
# makefile.mingw.in. Only for developer use.
makefile.mingw: makefile.mingw.in
sed -e 's,@GIMP[_]MAJOR_VERSION@,@GIMP_MAJOR_VERSION@,' \
-e 's,@GIMP[_]MINOR_VERSION@,@GIMP_MINOR_VERSION@,' <$< >$@

190
libgimpcolor/makefile.msc Normal file
View File

@ -0,0 +1,190 @@
## WARNING: Outdated.
## Makefile for building the GIMP DLLs and LIBs with Microsoft C.
## Use: nmake -f makefile.msc
# Change this to wherever you want to install the DLLs. This directory
# should be in your PATH. As these DLLs are for the GIMP and its plug-ins
# only, it probably is best to keep them in the GIMP's bin directory.
BIN = C:\install\gimp\bin
GIMP_VER = 1.2
# The name of the directory in your %HOME% where the GIMP's personal settings
# and stuff is saved.
GIMPDIR = _gimp$(GIMP_VER)
################################################################
# Nothing much configurable below
!IFNDEF DEBUG
# Full optimization:
OPTIMIZE = -Ox -MD
LINKDEBUG =
!ELSE
# Debugging:
OPTIMIZE = -Zi -MDd
LINKDEBUG = /debug
!ENDIF
# cl -? describes the options
CC = cl -G5 -GF $(OPTIMIZE) -W3 -nologo
LDFLAGS = /link $(LINKDEBUG)
INSTALL = copy
GTK_VER = 1.3
GLIB_VER = 1.3
GTK = ..\..\gtk+
GLIB = ..\..\glib
INTL = ..\..\intl
CFLAGS = -I.. -I$(GLIB) -I$(GTK)\gdk -I$(GTK)\gdk -I$(GTK) -I$(INTL) -DGIMPDIR=\"$(GIMPDIR)\" -DG_LOG_DOMAIN=\"LibGimp\"
all : \
..\config.h \
gimpi.lib \
gimp-$(GIMP_VER).dll \
gimpui-$(GIMP_VER).dll
..\config.h : ..\config.h.win32
copy ..\config.h.win32 ..\config.h
install : all
$(INSTALL) gimp-$(GIMP_VER).dll $(BIN)
$(INSTALL) gimpui-$(GIMP_VER).dll $(BIN)
PDB_WRAPPERS_O = \
gimpbrushes_pdb.obj \
gimpbrushselect_pdb.obj \
gimpchannel_pdb.obj \
gimpchannelops_pdb.obj \
gimpcolor_pdb.obj \
gimpconvert_pdb.obj \
gimpdisplay_pdb.obj \
gimpdrawable_pdb.obj \
gimpedit_pdb.obj \
gimpfileops_pdb.obj \
gimpfloatingsel_pdb.obj \
gimpgimprc_pdb.obj \
gimpgradients_pdb.obj \
gimpgradientselect_pdb.obj \
gimpguides_pdb.obj \
gimphelp_pdb.obj \
gimpimage_pdb.obj \
gimplayer_pdb.obj \
gimpmessage_pdb.obj \
gimppalette_pdb.obj \
gimpparasite_pdb.obj \
gimppatterns_pdb.obj \
gimppatternselect_pdb.obj \
gimpplugin_pdb.obj \
gimpproceduraldb_pdb.obj \
gimpselection_pdb.obj \
gimptexttool_pdb.obj \
gimptools_pdb.obj \
gimpundo_pdb.obj \
gimpunit_pdb.obj
gimpi_OBJECTS = \
gimpenv.obj \
gimpchainbutton.obj \
gimpcolorbutton.obj \
gimpcolorspace.obj \
gimpdialog.obj \
gimpfileselection.obj \
gimphelpui.obj \
gimpmatrix.obj \
gimpparasite.obj \
gimpparasiteio.obj \
gimppatheditor.obj \
gimppixmap.obj \
gimpprotocol.obj \
gimpquerybox.obj \
gimpsizeentry.obj \
gimpunitmenu.obj \
gimputils.c \
gimpvector.obj \
gimpwidgets.obj \
gimpwire.obj
gimpi.lib : $(gimpi_OBJECTS)
lib /out:gimpi.lib $(gimpi_OBJECTS)
gimp_OBJECTS = \
gimp.obj \
$(PDB_WRAPPERS_O) \
gimpchannel.obj \
gimpcolorspace.obj \
gimpdrawable.obj \
gimpenv.obj \
gimpgradientselect.obj \
gimphelp.obj \
gimpimage.obj \
gimplayer.obj \
gimpmatrix.obj \
gimpparasite.obj \
gimpparasiteio.obj \
gimppixelrgn.obj \
gimpproceduraldb.obj \
gimpprotocol.obj \
gimpselection.obj \
gimptile.obj \
gimpunit.obj \
gimpvector.obj \
gimpwire.obj
gimp-$(GIMP_VER).dll : $(gimp_OBJECTS) gimp.def
$(CC) $(CFLAGS) -LD -Fegimp-$(GIMP_VER).dll $(gimp_OBJECTS) $(INTL)\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS) user32.lib /def:gimp.def
# Pass -DLIBGIMP_COMPILATION when compiling gimp.c
gimp.obj : gimp.c
$(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimp.c
gimpui_OBJECTS = \
gimpmenu.obj \
gimpbrushmenu.obj \
gimpchainbutton.obj \
gimpcolorbutton.obj \
gimpdialog.obj \
gimpexport.obj \
gimpfileselection.obj \
gimphelpui.obj \
gimpgradientmenu.obj \
gimppatheditor.obj \
gimppatternmenu.obj \
gimppixmap.obj \
gimpquerybox.obj \
gimpsizeentry.obj \
gimpui.obj \
gimpunitmenu.obj \
gimpwidgets.obj
gimpui-$(GIMP_VER).dll : $(gimpui_OBJECTS) gimpui.def
$(CC) $(CFLAGS) -LD -Fegimpui-$(GIMP_VER).dll $(gimpui_OBJECTS) gimp-$(GIMP_VER).lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS) /def:gimpui.def
gimpmenu.obj : gimpmenu.c
$(CC) $(CFLAGS) -GD -c gimpmenu.c
gimpbrushmenu.obj : gimpbrushmenu.c
$(CC) $(CFLAGS) -GD -c gimpbrushmenu.c
gimpgradientmenu.obj : gimpgradientmenu.c
$(CC) $(CFLAGS) -GD -c gimpgradientmenu.c
gimppatternmenu.obj : gimppatternmenu.c
$(CC) $(CFLAGS) -GD -c gimppatternmenu.c
# General rule for compiling, used by the objects that don't go into
# gimp-$(GIMP_VER).dll.
.c.obj:
$(CC) $(CFLAGS) -c $<
clean:
del *.exe
del *.obj
del *.exp
del *.err
del *.map

7
plug-ins/FractalExplorer/Makefile.am
View File

@ -26,9 +26,10 @@ INCLUDES = \
-I$(includedir)
LDADD = \
$(top_builddir)/libgimp/libgimpui.la \
$(top_builddir)/libgimp/libgimp.la \
$(GTK_LIBS) \
$(top_builddir)/libgimp/libgimpui.la \
$(top_builddir)/libgimp/libgimp.la \
$(top_builddir)/libgimpcolor/libgimpcolor.la \
$(GTK_LIBS) \
$(INTLLIBS)
.PHONY: files

1
plug-ins/Lighting/Makefile.am
View File

@ -40,6 +40,7 @@ AM_CPPFLAGS = \
LDADD = \
$(top_builddir)/libgimp/libgimpui.la \
$(top_builddir)/libgimp/libgimp.la \
$(top_builddir)/libgimpcolor/libgimpcolor.la \
$(top_builddir)/plug-ins/libgck/gck/libgck.la \
$(GTK_LIBS) \
$(INTLLIBS)

1
plug-ins/MapObject/Makefile.am
View File

@ -39,6 +39,7 @@ INCLUDES = \
LDADD = \
$(top_builddir)/libgimp/libgimpui.la \
$(top_builddir)/libgimp/libgimp.la \
$(top_builddir)/libgimpcolor/libgimpcolor.la \
$(top_builddir)/plug-ins/libgck/gck/libgck.la \
$(GTK_LIBS) \
$(INTLLIBS)

7
plug-ins/bmp/Makefile.am
View File

@ -19,9 +19,10 @@ AM_CPPFLAGS = \
-DLOCALEDIR=\""$(localedir)"\"
LDADD = \
$(top_builddir)/libgimp/libgimpui.la \
$(top_builddir)/libgimp/libgimp.la \
$(GTK_LIBS) \
$(top_builddir)/libgimp/libgimpui.la \
$(top_builddir)/libgimp/libgimp.la \
$(top_builddir)/libgimpcolor/libgimpcolor.la \
$(GTK_LIBS) \
$(INTLLIBS)
.PHONY: files

Some files were not shown because too many files have changed in this diff Show More