Commit e6928cba authored by Hans Breuer's avatar Hans Breuer

changes to allow to build on win32 with msvc again

parent 5ffb34db
2001-02-07 Hans Breuer <Hans@Breuer.org>
* */makefile.msc : Gimp 1.3 for win32 (msc) builds and runs at
this short moment, it's a fast moving target nowadays :-)
* app/app_procs.c
* app/gimpbrush.c
* app/gimpbrushpipe.c
* app/gimppattern.c : make sure G_OS_WIN32 is defined (by glib.h
inclusion) before actually using it
* app/plug_in.h
* app/datafiles.h : <time.h> for time_t
* app/tile_swap.c : include <stdio.h> for SEEK_SET
* app/gimpcontainer.c : use G_GNUC_FUNCTION instead of
__FUNCTION__ to allow compiling without gcc
* app/dialog_handler.h : don't use conditional prototypes
for gmodule exported function but include <gmodule.h> and
use G_MODULE_EXPORT in prototype, too.
* app/gimpobject.h : added typedef for GimpObject
* libgimp/gimp.def : more exported symbols
* libgimp/gimpcolorselector.h : #include <gmodule.h> for
G_MODULE_EXPORT, sane prototypes.
* libgimp/gimpui.def : symbol export update, splitted to
gimpwidgets.def
* libgimpcolor/gimpcolor.def
* libgimpmath/gimpmath.def
* libgimpwidgets/gimpwidgets.def : updated
* libgimpwidgets/libgimp-glue.c : new file which supports
real dynamic linking on win32, against exported symbols from
the application or libgimp. This allows to resolve the
double dependency for currently 11 functions
2001-02-07 Michael Natterer <mitch@gimp.org>
* app/Makefile.am
......
......@@ -33,12 +33,13 @@
#include <unistd.h>
#endif
#include <gtk/gtk.h>
#include <gdk/gdktypes.h>
#ifdef G_OS_WIN32
#include <process.h> /* For _getpid() */
#endif
#include <gtk/gtk.h>
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h"
......@@ -56,6 +57,7 @@
#include "fileops.h"
#include "gdisplay.h"
#include "gdisplay_ops.h"
#include "gimpbrushlist.h"
#include "gimpcontext.h"
#include "gimpimage.h"
#include "gimprc.h"
......
......@@ -20,6 +20,7 @@
#include <glib.h>
#include <stdio.h> /* SEEK_SET */
#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
......
......@@ -29,7 +29,9 @@
#endif
#include <fcntl.h>
#ifdef G_OS_WIN32
#include <gtk/gtk.h>
#ifdef G_OS_WIN32 /* gets defined by glib.h */
#include <io.h>
#endif
......@@ -37,14 +39,12 @@
#define _O_BINARY 0
#endif
#include <gtk/gtk.h>
#include <stdio.h>
#include "apptypes.h"
#include "brush_header.h"
#include "brush_scale.h"
#include "gimpbrush.h"
#include "gimprc.h"
#include "temp_buf.h"
......
......@@ -29,7 +29,9 @@
#endif
#include <fcntl.h>
#ifdef G_OS_WIN32
#include <gtk/gtk.h>
#ifdef G_OS_WIN32 /* gets defined by glib.h */
#include <io.h>
#endif
......@@ -37,14 +39,12 @@
#define _O_BINARY 0
#endif
#include <gtk/gtk.h>
#include <stdio.h>
#include "apptypes.h"
#include "brush_header.h"
#include "brush_scale.h"
#include "gimpbrush.h"
#include "gimprc.h"
#include "temp_buf.h"
......
......@@ -31,16 +31,16 @@
#endif
#include <fcntl.h>
#ifdef G_OS_WIN32
#include <io.h>
#endif
#ifndef _O_BINARY
#define _O_BINARY 0
#endif
#include <gtk/gtk.h>
#ifdef G_OS_WIN32
#include <io.h>
#endif
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
......
......@@ -31,16 +31,16 @@
#endif
#include <fcntl.h>
#ifdef G_OS_WIN32
#include <io.h>
#endif
#ifndef _O_BINARY
#define _O_BINARY 0
#endif
#include <gtk/gtk.h>
#ifdef G_OS_WIN32
#include <io.h>
#endif
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
......
......@@ -255,7 +255,7 @@ gimp_container_add (GimpContainer *container,
if (gimp_container_have (container, object))
{
g_warning ("%s(): container already contains object %p",
__FUNCTION__, object);
G_GNUC_FUNCTION, object);
return FALSE;
}
......@@ -311,7 +311,7 @@ gimp_container_remove (GimpContainer *container,
if (! gimp_container_have (container, object))
{
g_warning ("%s(): container does not contains object %p",
__FUNCTION__, object);
G_GNUC_FUNCTION, object);
return FALSE;
}
......
......@@ -22,6 +22,7 @@
#ifndef __DATAFILES_H__
#define __DATAFILES_H__
#include <time.h>
typedef enum
{
......
......@@ -29,7 +29,7 @@
#define GIMP_IS_OBJECT(obj) (GTK_CHECK_TYPE ((obj), GIMP_TYPE_OBJECT))
#define GIMP_IS_OBJECT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_OBJECT))
typedef struct _GimpObject GimpObject;
typedef struct _GimpObjectClass GimpObjectClass;
struct _GimpObject
......
......@@ -21,6 +21,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
......@@ -29,6 +30,8 @@
#endif
#include <fcntl.h>
#include <gtk/gtk.h>
#ifdef G_OS_WIN32
#include <io.h>
#endif
......@@ -37,10 +40,6 @@
#define _O_BINARY 0
#endif
#include <gtk/gtk.h>
#include <stdio.h>
#include "apptypes.h"
#include "gimpimage.h"
......
......@@ -21,6 +21,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
......@@ -29,6 +30,8 @@
#endif
#include <fcntl.h>
#include <gtk/gtk.h>
#ifdef G_OS_WIN32
#include <io.h>
#endif
......@@ -37,10 +40,6 @@
#define _O_BINARY 0
#endif
#include <gtk/gtk.h>
#include <stdio.h>
#include "apptypes.h"
#include "gimpimage.h"
......
......@@ -22,6 +22,7 @@
#ifndef __DATAFILES_H__
#define __DATAFILES_H__
#include <time.h>
typedef enum
{
......
......@@ -20,8 +20,10 @@
#ifndef __DIALOG_HANDLER_H__
#define __DIALOG_HANDLER_H__
#include <gmodule.h>
G_MODULE_EXPORT
void dialog_register (GtkWidget *dialog);
G_MODULE_EXPORT
void dialog_unregister (GtkWidget *dialog);
void dialog_register_toolbox (GtkWidget *dialog);
......
......@@ -29,7 +29,9 @@
#endif
#include <fcntl.h>
#ifdef G_OS_WIN32
#include <gtk/gtk.h>
#ifdef G_OS_WIN32 /* gets defined by glib.h */
#include <io.h>
#endif
......@@ -37,14 +39,12 @@
#define _O_BINARY 0
#endif
#include <gtk/gtk.h>
#include <stdio.h>
#include "apptypes.h"
#include "brush_header.h"
#include "brush_scale.h"
#include "gimpbrush.h"
#include "gimprc.h"
#include "temp_buf.h"
......
......@@ -31,16 +31,16 @@
#endif
#include <fcntl.h>
#ifdef G_OS_WIN32
#include <io.h>
#endif
#ifndef _O_BINARY
#define _O_BINARY 0
#endif
#include <gtk/gtk.h>
#ifdef G_OS_WIN32
#include <io.h>
#endif
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
......
......@@ -255,7 +255,7 @@ gimp_container_add (GimpContainer *container,
if (gimp_container_have (container, object))
{
g_warning ("%s(): container already contains object %p",
__FUNCTION__, object);
G_GNUC_FUNCTION, object);
return FALSE;
}
......@@ -311,7 +311,7 @@ gimp_container_remove (GimpContainer *container,
if (! gimp_container_have (container, object))
{
g_warning ("%s(): container does not contains object %p",
__FUNCTION__, object);
G_GNUC_FUNCTION, object);
return FALSE;
}
......
......@@ -29,7 +29,7 @@
#define GIMP_IS_OBJECT(obj) (GTK_CHECK_TYPE ((obj), GIMP_TYPE_OBJECT))
#define GIMP_IS_OBJECT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_OBJECT))
typedef struct _GimpObject GimpObject;
typedef struct _GimpObjectClass GimpObjectClass;
struct _GimpObject
......
......@@ -21,6 +21,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
......@@ -29,6 +30,8 @@
#endif
#include <fcntl.h>
#include <gtk/gtk.h>
#ifdef G_OS_WIN32
#include <io.h>
#endif
......@@ -37,10 +40,6 @@
#define _O_BINARY 0
#endif
#include <gtk/gtk.h>
#include <stdio.h>
#include "apptypes.h"
#include "gimpimage.h"
......
## WARNING: Outdated.
## Makefile for building gimp.exe with Microsoft C
## Use: nmake -f makefile.msc
......@@ -8,19 +6,12 @@
# will pick it up.
BIN = C:\install\gimp\bin
TOP = ..\..
################################################################
# Nothing much configurable below
!IFNDEF DEBUG
# Full optimization:
OPTIMIZE = -Ox -MD
LINKDEBUG =
!ELSE
# Debugging:
OPTIMIZE = -Zi -MDd
LINKDEBUG = /debug
!ENDIF
!INCLUDE $(TOP)\build\win32\make.msc
# cl -? describes the options
CC = cl -GA -G5 -GF $(OPTIMIZE) -W3 -nologo
......@@ -28,16 +19,9 @@ CC = cl -GA -G5 -GF $(OPTIMIZE) -W3 -nologo
LDFLAGS = /link /subsystem:console /machine:ix86 $(LINKDEBUG)
INSTALL = copy
GIMP_VER = 1.2
GTK_VER = 1.3
GLIB_VER = 1.3
GIMP_VER = 1.3
GTK = ..\..\gtk+
GLIB = ..\..\glib
GMODULE = $(GLIB)\gmodule
INTL = ..\..\intl
CFLAGS = -DREGEX_MALLOC -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"Gimp\" -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK)\gdk -I$(GTK)\gdk -I$(GTK) -I$(INTL)
CFLAGS = -DREGEX_MALLOC -DHAVE_CONFIG_H -I. -I.. $(GLIB_CFLAGS) $(GTK_CFLAGS) $(INTL_CFLAGS)
all : \
..\config.h \
......@@ -56,205 +40,153 @@ gimpim_OBJECTS = \
gimpimage.obj \
gimpobject.obj \
gimppreviewcache.obj\
gimpset.obj \
gimpsignal.obj
# gimpset.obj \
# gimpsignal.obj
gimpim.lib : $(gimpim_OBJECTS)
lib /out:gimpim.lib $(gimpim_OBJECTS)
gimp_OBJECTS = \
about_dialog.obj \
airbrush.obj \
airbrush_blob.obj \
app_procs.obj \
asupsample.obj \
batch.obj \
bezier_select.obj \
blend.obj \
blob.obj \
boundary.obj \
brightness_contrast.obj \
brush_edit.obj \
brush_scale.obj \
brush_select.obj \
brush_select_cmds.obj \
brushes_cmds.obj \
bucket_fill.obj \
by_color_select.obj \
channel.obj \
channel_cmds.obj \
channels_dialog.obj \
channel_ops.obj \
channel_ops_cmds.obj \
clone.obj \
color_area.obj \
color_balance.obj \
color_cmds.obj \
color_notebook.obj \
color_panel.obj \
color_picker.obj \
color_select.obj \
color_transfer.obj \
colormaps.obj \
colormap_dialog.obj \
commands.obj \
context_manager.obj \
convert.obj \
convert_cmds.obj \
convolve.obj \
crop.obj \
cursorutil.obj \
curves.obj \
datafiles.obj \
desaturate.obj \
devices.obj \
dialog_handler.obj \
disp_callbacks.obj \
docindex.obj \
dodgeburn.obj \
draw_core.obj \
drawable.obj \
drawable_cmds.obj \
edit_cmds.obj \
edit_selection.obj \
ellipse_select.obj \
eraser.obj \
errorconsole.obj \
errors.obj \
equalize.obj \
fileops.obj \
fileops_cmds.obj \
flip_tool.obj \
floating_sel.obj \
floating_sel_cmds.obj \
file_new_dialog.obj \
free_select.obj \
fuzzy_select.obj \
gdisplay.obj \
gdisplay_cmds.obj \
gdisplay_ops.obj \
general.obj \
gimage.obj \
gimage_cmds.obj \
gimage_mask.obj \
gimage_mask_cmds.obj \
gimpbrush.obj \
gimpbrushgenerated.obj \
gimpbrushlist.obj \
gimpbrushpipe.obj \
gimpcontext.obj \
gimpcontextpreview.obj \
gimpdnd.obj \
gimphelp.obj \
gimphelp_cmds.obj \
gimphistogram.obj \
gimplist.obj \
gimplut.obj \
gimpparasite.obj \
gimpprogress.obj \
gimprc.obj \
gimprc_cmds.obj \
gimpui.obj \
gimpunit.obj \
global_edit.obj \
gradient.obj \
gradient_cmds.obj \
gradient_select.obj \
gradient_select_cmds.obj\
guides_cmds.obj \
gtkwrapbox.obj \
gtkhwrapbox.obj \
gtkvwrapbox.obj \
gximage.obj \
histogramwidget.obj \
histogram_tool.obj \
hue_saturation.obj \
image_map.obj \
image_new.obj \
image_render.obj \
indicator_area.obj \
info_dialog.obj \
info_window.obj \
ink.obj \
interface.obj \
interface_cmds.obj \
internal_procs.obj \
invert.obj \
iscissors.obj \
layer.obj \
layer_cmds.obj \
layer_select.obj \
layers_dialog.obj \
lc_dialog.obj \
levels.obj \
lut_funcs.obj \
magnify.obj \
main.obj \
measure.obj \
menus.obj \
misc_cmds.obj \
module_db.obj \
move.obj \
nav_window.obj \
ops_buttons.obj \
palette.obj \
palette_cmds.obj \
palette_select.obj \
paint_core.obj \
paint_funcs.obj \
paintbrush.obj \
parasite_cmds.obj \
parasitelist.obj \
path.obj \
paths_cmds.obj \
paths_dialog.obj \
pattern_select.obj \
pattern_select_cmds.obj \
patterns.obj \
patterns_cmds.obj \
pencil.obj \
perspective_tool.obj \
pixel_processor.obj \
pixel_region.obj \
plug_in.obj \
plug_in_cmds.obj \
posterize.obj \
preferences_dialog.obj \
procedural_db.obj \
procedural_db_cmds.obj \
qmask.obj \
rect_select.obj \
regex.obj \
resize.obj \
rotate_tool.obj \
scale.obj \
scale_tool.obj \
scan_convert.obj \
scroll.obj \
selection.obj \
session.obj \
shear_tool.obj \
smudge.obj \
temp_buf.obj \
text_tool.obj \
text_tool_cmds.obj \
threshold.obj \
tile.obj \
tile_cache.obj \
tile_manager.obj \
tile_swap.obj \
tips_dialog.obj \
tool_options.obj \
tools.obj \
tools_cmds.obj \
transform_core.obj \
transform_tool.obj \
undo.obj \
undo_cmds.obj \
undo_history.obj \
unit_cmds.obj \
user_install.obj \
xcf.obj
about_dialog.obj \
app_procs.obj \
asupsample.obj \
batch.obj \
boundary.obj \
brush_edit.obj \
brush_scale.obj \
brush_select.obj \
brushes.obj \
channel_ops.obj \
channels_dialog.obj \
color_area.obj \
color_notebook.obj \
color_panel.obj \
color_select.obj \
color_transfer.obj \
colormap_dialog.obj \
colormaps.obj \
commands.obj \
context_manager.obj \
convert.obj \
cursorutil.obj \
datafiles.obj \
desaturate.obj \
devices.obj \
dialog_handler.obj \
disp_callbacks.obj \
docindex.obj \
draw_core.obj \
drawable.obj \
equalize.obj \
errorconsole.obj \
errors.obj \
file_new_dialog.obj \
fileops.obj \
floating_sel.obj \
gdisplay.obj \
gdisplay_ops.obj \
general.obj \
gimage.obj \
gimage_mask.obj \
gimpbrush.obj \
gimpbrushgenerated.obj \
gimpbrushpipe.obj \
gimpchannel.obj \
gimpconstrainedhwrapbox.obj \
gimpcontainer.obj \
gimpcontainergridview.obj \
gimpcontainerlistview.obj \
gimpcontainerview.obj \
gimpcontext.obj \
gimpcontextpreview.obj \
gimpdatalist.obj \
gimpdnd.obj \
gimpdrawable.obj \
gimpdrawablepreview.obj \
gimphelp.obj \
gimphistogram.obj \
gimpimage.obj \
gimplayer.obj \
gimplayermask.obj \
gimplist.obj \
gimplut.obj \
gimpmarshal.obj \
gimpobject.obj \
gimppalette.obj \
gimpparasite.obj \
gimppattern.obj \
gimppreview.obj \
gimppreviewcache.obj \
gimpprogress.obj \
gimprc.obj \
gimpui.obj \
gimpunit.obj \
gimpviewable.obj \
global_edit.obj \
gradient.obj \
gradient_select.obj \
gtkhwrapbox.obj \
gtkvwrapbox.obj \
gtkwrapbox.obj \
gximage.obj \
histogramwidget.obj \
image_map.obj \
image_new.obj \
image_render.obj \
indicator_area.obj \
info_dialog.obj \
info_window.obj \
interface.obj \
invert.obj \
layer_select.obj \
layers_dialog.obj \
lc_dialog.obj \
libgimp_glue.obj \
lut_funcs.obj \
main.obj \
menus.obj \
module_db.obj \
nav_window.obj \
ops_buttons.obj \
paint_funcs.obj \
palette.obj \
palette_import.obj \
palette_select.obj \
parasitelist.obj \
path.obj \
paths_dialog.obj \
pattern_select.obj \
patterns.obj \
pixel_processor.obj \
pixel_region.obj \
plug_in.obj \
preferences_dialog.obj \
qmask.obj \
regexrepl.obj \
resize.obj \
resolution_calibrate.obj \
scale.obj \
scan_convert.obj \
scroll.obj \
selection.obj \
session.obj \
temp_buf.obj \
tile.obj \
tile_cache.obj \
tile_manager.obj \
tile_swap.obj \
tips_dialog.obj \
toolbox.obj \
undo.obj \
undo_history.obj \
user_install.obj \
xcf.obj \