Commit 8522a847 authored by Hans Breuer's avatar Hans Breuer Committed by Hans Breuer
Browse files

add appconfig.lib. Statically link libgimptool/gimptool.lib.

2001-05-11  Hans Breuer  <hans@breuer.org>

	* app/makefile.msc : add appconfig.lib. Statically
	link libgimptool/gimptool.lib.

	* app/main.c : use gimp_locale_directory()

	* app/config/gimpconfig-utils.c : <string.h>

	* app/config/makefile.msc : add gimpscanner

	* app/core/gimpimagefile.c : some G_OS_WIN32 mess to get
	mkdir() and chmod()

	* app/display/gimpdisplayshell.c
	  app/plug-in/plug-in-progrss.c
	  app/tool/gimpcolorpickertool.c
	  app/tool/gimpcroptool.c
	  app/tool/gimpmeasuretool.c
	  app/tool/gimpperspectivetool.c
	  app/tool/gimprotatetool.c
	  app/tool/gimpscaletool.c
	  app/tool/gimpsheartool.c
	  app/tool/gimptransformtool.c
	  app/widgets/gimpcolormapeditor.c
	  app/widgets/gimpcolorpanel.c
	  app/widgets/gimptoolbox-color-area.c
	add #ifdef __GNUC__ to avoid breaking on non standard
	pragma #warning

	* app/tools/makefile.msc : add gimptoolcontrol remove
	tools-enum

	* app/tools/tool_manager.c : need to include
	libgimptool/gimptoolcontrol.h after core includes
	otherwise we would compile without prototypes or
	break miserably

	* app/gui/plug-in-menus.c : replace LOCALEDIR with
	gimp_locale_directory ()

	* app/gui/preferences-dialog.c (prefs_notebook_append_page) :
	only try to gdk_pixbuf_new_from_file() with a valid filename.
	It should simply return NULL otherwise, but fails if the
	filename is an empty string.

	* app/paint-funcs/makefile.msc : add -FImsvc_recommended_pragmas.h

	* app/widgets/gimpcolormapeditor.c : the 'row'
	allocated needs to be 'xn * cellsize * 2' (to avoid
	accessing unowned memory) not only width, which has
	become allocation.width by someone commenting out
	the correct size calculation

	* app/widgets/gimpdialogfactory.c : varargs to macros
	are GCCism or at least non standard. #define DEBUG
	to g_print or nothing - without arguments - does fix
	it somewhat dirty as the compiler needs to tolerate
	the '(blah, foo, bar);' statement than

	* app/widgets/makefile.msc : updated

	* app/xcf/makefile.msc : add -FImsvc_recommended_pragmas.h

	* etc/gimprc.win32 : use ';' to separate theme-path

	* libgimpbase/gimpenv.c : #include <stdio.h>
	for sprintf()

	* app/widgets/gimpdnd.c (gimp_dnd_set_file_data) :
	the passed in vals chunk is not always null-terminated
	(at least not on win32). Use the length parameter too
	to avoid reading junk filenames.

	* libgimp/gimp.def : export gimp_image_get_name()

	* libgimpbase/gimpbase.def : export gimp_locale_directory()
	* libgimpbase/gimpenv.[ch] : added gimp_locale_directory ()

	* libgimpbase/makefile.msc : define DATADIR and SYSCONFDIR
	to empty string to let gimp find its files in the common
	place (win32: relative to the top level gimp dir)

	* plug-ins/common/pixelize.c : <string.h>

	* plug-ins/flame/cmap.c : #include <glib.h> for g_random_int()

	* plug-ins/makefile.msc : -FImsvc_recommended_pragams.h
	and a little hack to give imagemap the prototypes it
	desires without changing the lexed source

	* themes/Default/images/makefile.msc : now added (see below)

	* themes/Default/images/stock-button-reset.png : made it binary
parent 666b72e5
2001-05-11 Hans Breuer <hans@breuer.org>
* app/makefile.msc : add appconfig.lib. Statically
link libgimptool/gimptool.lib.
* app/main.c : use gimp_locale_directory()
* app/config/gimpconfig-utils.c : <string.h>
* app/config/makefile.msc : add gimpscanner
* app/core/gimpimagefile.c : some G_OS_WIN32 mess to get
mkdir() and chmod()
* app/display/gimpdisplayshell.c
app/plug-in/plug-in-progrss.c
app/tool/gimpcolorpickertool.c
app/tool/gimpcroptool.c
app/tool/gimpmeasuretool.c
app/tool/gimpperspectivetool.c
app/tool/gimprotatetool.c
app/tool/gimpscaletool.c
app/tool/gimpsheartool.c
app/tool/gimptransformtool.c
app/widgets/gimpcolormapeditor.c
app/widgets/gimpcolorpanel.c
app/widgets/gimptoolbox-color-area.c
add #ifdef __GNUC__ to avoid breaking on non standard
pragma #warning
* app/tools/makefile.msc : add gimptoolcontrol remove
tools-enum
* app/tools/tool_manager.c : need to include
libgimptool/gimptoolcontrol.h after core includes
otherwise we would compile without prototypes or
break miserably
* app/gui/plug-in-menus.c : replace LOCALEDIR with
gimp_locale_directory ()
* app/gui/preferences-dialog.c (prefs_notebook_append_page) :
only try to gdk_pixbuf_new_from_file() with a valid filename.
It should simply return NULL otherwise, but fails if the
filename is an empty string.
* app/paint-funcs/makefile.msc : add -FImsvc_recommended_pragmas.h
* app/widgets/gimpcolormapeditor.c : the 'row'
allocated needs to be 'xn * cellsize * 2' (to avoid
accessing unowned memory) not only width, which has
become allocation.width by someone commenting out
the correct size calculation
* app/widgets/gimpdialogfactory.c : varargs to macros
are GCCism or at least non standard. #define DEBUG
to g_print or nothing - without arguments - does fix
it somewhat dirty as the compiler needs to tolerate
the '(blah, foo, bar);' statement than
* app/widgets/makefile.msc : updated
* app/xcf/makefile.msc : add -FImsvc_recommended_pragmas.h
* etc/gimprc.win32 : use ';' to separate theme-path
* libgimpbase/gimpenv.c : #include <stdio.h>
for sprintf()
* app/widgets/gimpdnd.c (gimp_dnd_set_file_data) :
the passed in vals chunk is not always null-terminated
(at least not on win32). Use the length parameter too
to avoid reading junk filenames.
* libgimp/gimp.def : export gimp_image_get_name()
* libgimpbase/gimpbase.def : export gimp_locale_directory()
* libgimpbase/gimpenv.[ch] : added gimp_locale_directory ()
* libgimpbase/makefile.msc : define DATADIR and SYSCONFDIR
to empty string to let gimp find its files in the common
place (win32: relative to the top level gimp dir)
* plug-ins/common/pixelize.c : <string.h>
* plug-ins/flame/cmap.c : #include <glib.h> for g_random_int()
* plug-ins/makefile.msc : -FImsvc_recommended_pragams.h
and a little hack to give imagemap the prototypes it
desires without changing the lexed source
* themes/Default/images/makefile.msc : now added (see below)
* themes/Default/images/stock-button-reset.png : made it binary
2002-05-10 Michael Natterer <mitch@gimp.org>
 
* app/display/gimpdisplay.c: EEK, actually increase
......
......@@ -21,6 +21,8 @@
#include "config.h"
#include <string.h>
#include <glib-object.h>
#include "libgimpbase/gimpenv.h"
......
......@@ -8,7 +8,10 @@ PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc
PKG_LINK = \
$(GLIB_LIBS)
..\base\appbase-$(PKG_VER).lib \
..\..\libgimpwidgets\gimpwidgets-$(PKG_VER).lib \
..\..\libgimpbase\gimpbase-$(PKG_VER).lib \
$(GLIB_LIBS) $(INTL_LIBS)
OBJECTS = \
gimpbaseconfig.obj \
......@@ -23,6 +26,7 @@ OBJECTS = \
gimpdisplayconfig.obj \
gimpguiconfig.obj \
gimprc.obj \
gimpscanner.obj
INCLUDES = \
-FImsvc_recommended_pragmas.h \
......@@ -36,8 +40,9 @@ DEFINES = \
all : \
$(PRJ_TOP)\config.h \
$(PACKAGE).lib \
!IFDEF DLLGIMP
$(PACKAGE)-$(PKG_VER).dll
!ENDIF
$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
......
......@@ -38,6 +38,10 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#ifdef G_OS_WIN32
# include <direct.h>
# define mkdir(n,a) _mkdir(n)
# include <io.h>
# define chmod(n,f) _chmod(n,f)
# ifndef S_ISREG
# define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
# endif
......
......@@ -87,6 +87,7 @@ OBJECTS = \
gimpundo.obj \
gimpundostack.obj \
gimpunit.obj \
gimpunits.obj \
gimpviewable.obj \
OTHER_FILES = \
......
......@@ -1404,7 +1404,10 @@ prefs_notebook_append_page (Gimp *gimp,
notebook_icon,
NULL);
pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
if (g_file_test (filename, G_FILE_TEST_IS_REGULAR))
pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
else
pixbuf = NULL;
g_free (filename);
......
......@@ -28,7 +28,9 @@
#include "display-types.h"
#ifdef __GNUC__
#warning FIXME #include "gui/gui-types.h"
#endif
#include "gui/gui-types.h"
#include "core/gimp.h"
......
......@@ -28,7 +28,9 @@
#include "display-types.h"
#ifdef __GNUC__
#warning FIXME #include "gui/gui-types.h"
#endif
#include "gui/gui-types.h"
#include "core/gimp.h"
......
......@@ -31,6 +31,7 @@ OBJECTS = \
gimpdisplayshell-scale.obj \
gimpdisplayshell-scroll.obj \
gimpdisplayshell-selection.obj \
gimpnavigationview.obj \
gimpprogress.obj \
gimpstatusbar.obj \
display-enums.obj \
......
......@@ -48,6 +48,7 @@ OBJECTS = \
gui.obj \
help-commands.obj \
image-commands.obj \
images-commands.obj \
info-dialog.obj \
info-window.obj \
layers-commands.obj \
......
......@@ -36,6 +36,7 @@
#include "plug-in-commands.h"
#include "plug-in-menus.h"
#include "libgimpbase/gimpenv.h"
#include "libgimp/gimpintl.h"
......@@ -52,7 +53,7 @@ plug_in_make_menu (GSList *plug_in_defs,
GTree *menu_entries;
#ifdef ENABLE_NLS
bindtextdomain (std_plugins_domain, LOCALEDIR);
bindtextdomain (std_plugins_domain, gimp_locale_directory ());
bind_textdomain_codeset (std_plugins_domain, "UTF-8");
domains = g_slist_append (domains, (gpointer) std_plugins_domain);
#endif
......@@ -94,7 +95,7 @@ plug_in_make_menu (GSList *plug_in_defs,
if (plug_in_def->locale_path)
bindtextdomain (domain, plug_in_def->locale_path);
else
bindtextdomain (domain, LOCALEDIR);
bindtextdomain (domain, gimp_locale_directory ());
bind_textdomain_codeset (domain, "UTF-8");
}
}
......
......@@ -1404,7 +1404,10 @@ prefs_notebook_append_page (Gimp *gimp,
notebook_icon,
NULL);
pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
if (g_file_test (filename, G_FILE_TEST_IS_REGULAR))
pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
else
pixbuf = NULL;
g_free (filename);
......
......@@ -120,10 +120,10 @@ main (int argc,
setlocale (LC_ALL, "");
bindtextdomain (GETTEXT_PACKAGE"-libgimp", LOCALEDIR);
bindtextdomain (GETTEXT_PACKAGE"-libgimp", gimp_locale_directory ());
bind_textdomain_codeset (GETTEXT_PACKAGE"-libgimp", "UTF-8");
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
bindtextdomain (GETTEXT_PACKAGE, gimp_locale_directory ());
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
......
......@@ -11,7 +11,8 @@ top_srcdir = $(PRJ_TOP)
top_builddir = $(PRJ_TOP)
includedir = $(PRJ_TOP)
LT_RELEASE = $(PKG_VER)
SUBDIRS = paint-funcs base xcf core file display paint vectors pdb plug-in tools widgets gui
SUBDIRS = paint-funcs base config xcf core file \
display paint vectors pdb plug-in tools widgets gui
sub-all:
for %d in ($(SUBDIRS)) do nmake -nologo -f makefile.msc sub-one THIS=%d
......@@ -24,6 +25,7 @@ sub-one:
LDFLAGS = /link /subsystem:console /machine:ix86 $(LINKDEBUG)
PKG_LINK = \
config/appconfig.lib \
paint/apppaint.lib \
paint-funcs/apppaint-funcs.lib \
plug-in/appplug-in.lib \
......@@ -39,6 +41,9 @@ PKG_LINK = \
vectors/appvectors.lib \
plug-in/appplug-in.lib \
$(PRJ_TOP)/regexrepl/regexrepl.lib \
\
$(top_builddir)/libgimptool/gimptool.lib \
\
$(top_builddir)/libgimpcolor/gimpcolor-$(LT_RELEASE).lib \
$(top_builddir)/libgimpmath/gimpmath-$(LT_RELEASE).lib \
$(top_builddir)/libgimpbase/gimpbase-$(LT_RELEASE).lib \
......@@ -67,7 +72,6 @@ mmx_sources = \
OBJECTS = \
nav_window.obj \
ops_buttons.obj \
undo_history.obj \
image_map.obj \
......@@ -81,7 +85,6 @@ OBJECTS = \
main.obj \
batch.obj \
errors.obj \
gimphelp.obj \
libgimp_glue.obj \
......
......@@ -36,6 +36,7 @@
#include "plug-in-commands.h"
#include "plug-in-menus.h"
#include "libgimpbase/gimpenv.h"
#include "libgimp/gimpintl.h"
......@@ -52,7 +53,7 @@ plug_in_make_menu (GSList *plug_in_defs,
GTree *menu_entries;
#ifdef ENABLE_NLS
bindtextdomain (std_plugins_domain, LOCALEDIR);
bindtextdomain (std_plugins_domain, gimp_locale_directory ());
bind_textdomain_codeset (std_plugins_domain, "UTF-8");
domains = g_slist_append (domains, (gpointer) std_plugins_domain);
#endif
......@@ -94,7 +95,7 @@ plug_in_make_menu (GSList *plug_in_defs,
if (plug_in_def->locale_path)
bindtextdomain (domain, plug_in_def->locale_path);
else
bindtextdomain (domain, LOCALEDIR);
bindtextdomain (domain, gimp_locale_directory ());
bind_textdomain_codeset (domain, "UTF-8");
}
}
......
......@@ -22,6 +22,7 @@ PKG_LINK = \
..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \
INCLUDES = \
-FImsvc_recommended_pragmas.h \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GTK2_CFLAGS) \
......
......@@ -22,7 +22,9 @@
#include "plug-in-types.h"
#ifdef __GNUC__
#warning FIXME #include "display/display-types.h"
#endif
#include "display/display-types.h"
#include "display/gimpdisplay.h"
......
......@@ -22,7 +22,9 @@
#include "plug-in-types.h"
#ifdef __GNUC__
#warning FIXME #include "display/display-types.h"
#endif
#include "display/display-types.h"
#include "display/gimpdisplay.h"
......
......@@ -25,7 +25,9 @@
#include "tools-types.h"
#ifdef __GNUC__
#warning FIXME #include "gui/gui-types.h"
#endif
#include "gui/gui-types.h"
#include "core/gimp.h"
......
......@@ -27,7 +27,9 @@
#include "tools-types.h"
#ifdef __GNUC__
#warning FIXME #include "gui/gui-types.h"
#endif
#include "gui/gui-types.h"
#include "core/gimpdrawable.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment