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

changes to allow to build on win32 with msvc again

Browse Source
This commit is contained in:
Hans Breuer
2001-02-07 01:16:18 +00:00
parent 5ffb34db38
commit e6928cba2d
42 changed files with 772 additions and 912 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libgimp/gimp.def
View File

@ -389,3 +389,5 @@ EXPORTS
wire_write_int8
wire_write_msg
wire_write_string
gimp_bilinear
gimp_bilinear_rgba

71
libgimp/gimpui.def
View File

@ -2,88 +2,17 @@ EXPORTS
gimp_brush_select_widget
gimp_brush_select_widget_close_popup
gimp_brush_select_widget_set_popup
gimp_chain_button_get_active
gimp_chain_button_get_type
gimp_chain_button_new
gimp_chain_button_set_active
gimp_channel_menu_new
gimp_color_button_double_new
gimp_color_button_get_type
gimp_color_button_new
gimp_color_button_update
gimp_context_help
gimp_coordinates_new
gimp_dialog_create_action_area
gimp_dialog_create_action_areav
gimp_dialog_new
gimp_dialog_newv
gimp_dialog_set_icon
gimp_double_adjustment_update
gimp_drawable_menu_new
gimp_export_image
gimp_file_selection_get_filename
gimp_file_selection_get_type
gimp_file_selection_new
gimp_file_selection_set_filename
gimp_float_adjustment_update
gimp_gradient_select_widget
gimp_gradient_select_widget_close_popup
gimp_gradient_select_widget_set_popup
gimp_help_connect_help_accel
gimp_help_disable_tooltips
gimp_help_enable_tooltips
gimp_help_free
gimp_help_init
gimp_help_set_help_data
gimp_image_menu_new
gimp_int_adjustment_update
gimp_interactive_selection_brush
gimp_interactive_selection_pattern
gimp_layer_menu_new
gimp_menu_item_update
gimp_option_menu_new
gimp_option_menu_new2
gimp_option_menu_set_history
gimp_path_editor_get_path
gimp_path_editor_get_type
gimp_path_editor_new
gimp_pattern_select_widget
gimp_pattern_select_widget_close_popup
gimp_pattern_select_widget_set_popup
gimp_pixmap_button_new
gimp_pixmap_get_type
gimp_pixmap_new
gimp_pixmap_set
gimp_query_boolean_box
gimp_query_double_box
gimp_query_int_box
gimp_query_size_box
gimp_query_string_box
gimp_radio_button_update
gimp_radio_group_new
gimp_radio_group_new2
gimp_random_seed_new
gimp_scale_entry_new
gimp_size_entry_add_field
gimp_size_entry_attach_label
gimp_size_entry_get_refval
gimp_size_entry_get_type
gimp_size_entry_get_unit
gimp_size_entry_get_value
gimp_size_entry_grab_focus
gimp_size_entry_new
gimp_size_entry_set_refval
gimp_size_entry_set_refval_boundaries
gimp_size_entry_set_refval_digits
gimp_size_entry_set_resolution
gimp_size_entry_set_size
gimp_size_entry_set_unit
gimp_size_entry_set_value
gimp_size_entry_set_value_boundaries
gimp_spin_button_new
gimp_table_attach_aligned
gimp_toggle_button_sensitive_update
gimp_toggle_button_update
gimp_ui_init
gimp_uint_adjustment_update
gimp_unit_menu_update

75
libgimp/makefile.msc
View File

@ -1,5 +1,3 @@
## WARNING: Outdated.
## Makefile for building the GIMP DLLs and LIBs with Microsoft C.
## Use: nmake -f makefile.msc
@ -8,7 +6,10 @@
# only, it probably is best to keep them in the GIMP's bin directory.
BIN = C:\install\gimp\bin
GIMP_VER = 1.2
TOP = ..\..
!INCLUDE $(TOP)\build\win32\make.msc
GIMP_VER = 1.3
# The name of the directory in your %HOME% where the GIMP's personal settings
# and stuff is saved.
@ -18,30 +19,12 @@ GIMPDIR = _gimp$(GIMP_VER)
# Nothing much configurable below
!IFNDEF DEBUG
# Full optimization:
OPTIMIZE = -Ox -MD
LINKDEBUG =
!ELSE
# Debugging:
OPTIMIZE = -Zi -MDd
LINKDEBUG = /debug
!ENDIF
INCLUDES = -I..
DEFINES = -DGIMPDIR=\"$(GIMPDIR)\"
DEPCFLAGS = $(INTL_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
DEPLIBS = $(GLIB_LIBS) $(INTL_LIBS)
# 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\"
# CFLAGS = $(GLIB_CFLAGS)
all : \
..\config.h \
@ -76,8 +59,10 @@ PDB_WRAPPERS_O = \
gimpimage_pdb.obj \
gimplayer_pdb.obj \
gimpmessage_pdb.obj \
gimpmisc_pdb.obj \
gimppalette_pdb.obj \
gimpparasite_pdb.obj \
gimppaths_pdb.obj \
gimppatterns_pdb.obj \
gimppatternselect_pdb.obj \
gimpplugin_pdb.obj \
@ -86,14 +71,16 @@ PDB_WRAPPERS_O = \
gimptexttool_pdb.obj \
gimptools_pdb.obj \
gimpundo_pdb.obj \
gimpunit_pdb.obj
gimpunit_pdb.obj \
# used by libgimp and core (?)
gimpi_OBJECTS = \
gimpenv.obj \
gimpparasite.obj \
gimpparasiteio.obj \
gimpprotocol.obj \
gimputils.c \
gimputils.obj \
# gimpsignal.obj \
gimpwire.obj
gimpi.lib : $(gimpi_OBJECTS)
@ -102,26 +89,25 @@ gimpi.lib : $(gimpi_OBJECTS)
gimp_OBJECTS = \
gimp.obj \
$(PDB_WRAPPERS_O) \
$(gimpi_OBJECTS) \
gimpadaptivesupersample.obj \
gimpbilinear.obj \
gimpchannel.obj \
gimpcolorspace.obj \
gimpdrawable.obj \
gimpenv.obj \
gimpgradientselect.obj \
gimphelp.obj \
gimpimage.obj \
gimplayer.obj \
gimpparasite.obj \
gimpparasiteio.obj \
gimppixelrgn.obj \
gimpproceduraldb.obj \
gimpprotocol.obj \
gimpselection.obj \
gimptile.obj \
gimpunit.obj \
gimpwire.obj
#? gimpprotocol.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
$(CC) $(CFLAGS) -LD -Fegimp-$(GIMP_VER).dll $(gimp_OBJECTS) $(DEPLIBS) ..\libgimpcolor\gimpcolor-$(GIMP_VER).lib $(LDFLAGS) user32.lib /def:gimp.def
# Pass -DLIBGIMP_COMPILATION when compiling gimp.c
@ -129,16 +115,22 @@ gimp.obj : gimp.c
$(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimp.c
gimpui_OBJECTS = \
gimpmenu.obj \
gimpui.obj \
gimpadaptivesupersample.obj \
gimpbrushmenu.obj \
gimpexport.obj \
gimpgradientmenu.obj \
gimppatheditor.obj \
gimpmenu.obj \
gimppatternmenu.obj \
gimpui.obj
gimpexport.obj \
# gimppatheditor.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
$(CC) $(CFLAGS) -LD -Fegimpui-$(GIMP_VER).dll $(gimpui_OBJECTS) \
gimp-$(GIMP_VER).lib ..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \
..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
$(GTK_LIBS) $(INTL_LIBS) $(DEPLIBS) $(LDFLAGS) /def:gimpui.def
# gimpwidgets only for gimp_dialog_new
gimpmenu.obj : gimpmenu.c
$(CC) $(CFLAGS) -GD -c gimpmenu.c
@ -156,7 +148,8 @@ gimppatternmenu.obj : gimppatternmenu.c
# gimp-$(GIMP_VER).dll.
.c.obj:
$(CC) $(CFLAGS) -c $<
clean:
clean::
del *.exe
del *.obj
del *.exp