Commit 364272b5 authored by Hans Breuer's avatar Hans Breuer Committed by Hans Breuer

new file to build it all ... added to EXTRA_DIST

2003-07-20  Hans Breuer  <hans@breuer.org>

	* makefile.msc : new file to build it all
	* Makefile.am : ... added to EXTRA_DIST

	* gdk/makefile.msc gtk/stock-icons/makefile.msc
	  gtk/makefile.msc.in tests/makefile.msc : updated

	* gdk/gdk.def gtk/gtk.def : export a bunch of new
	functions

	* gtk/gtkbbox.c : use g_return_val_if_fail() if
	there is a value to return

	* gtk/gtkfontsel.c gtk/gtkiconfactory.c :
	static correctness

	* gtk/gtkicontheme.c : ported to use GTimeVal instead of
	struct timeval and GTK_DATA_PREFIX instead of GTK_DATADIR

	* gtk/gtkicontheme.c : use HAVE_LC_MESSAGES

	* gtk/gtkimmulticontext.c : use gtkprivate.h

	* gtk/stock-icons/stock_color_picker_25.png
	  gtk/stock-icons/stock_jump_to_rtl_16.png
	  gtk/stock-icons/stock_jump_to_rtl_24.png
	  gtk/stock-icons/stock_redo_rtl_16.png
	  gtk/stock-icons/stock_redo_rtl_24.png
	  gtk/stock-icons/stock_undelete_rtl_16.png
	  gtk/stock-icons/stock_undelete_rtl_24.png
	  gtk/stock-icons/stock_undo_rtl_16.png :
	  gtk/stock-icons/stock_undo_rtl_24.png :
	readded as binary
parent c80e5e66
2003-07-20 Hans Breuer <hans@breuer.org>
* makefile.msc : new file to build it all
* Makefile.am : ... added to EXTRA_DIST
* gdk/makefile.msc gtk/stock-icons/makefile.msc
gtk/makefile.msc.in tests/makefile.msc : updated
* gdk/gdk.def gtk/gtk.def : export a bunch of new
functions
* gtk/gtkbbox.c : use g_return_val_if_fail() if
there is a value to return
* gtk/gtkfontsel.c gtk/gtkiconfactory.c :
static correctness
* gtk/gtkicontheme.c : ported to use GTimeVal instead of
struct timeval and GTK_DATA_PREFIX instead of GTK_DATADIR
* gtk/gtkicontheme.c : use HAVE_LC_MESSAGES
* gtk/gtkimmulticontext.c : use gtkprivate.h
* gtk/stock-icons/stock_color_picker_25.png
gtk/stock-icons/stock_jump_to_rtl_16.png
gtk/stock-icons/stock_jump_to_rtl_24.png
gtk/stock-icons/stock_redo_rtl_16.png
gtk/stock-icons/stock_redo_rtl_24.png
gtk/stock-icons/stock_undelete_rtl_16.png
gtk/stock-icons/stock_undelete_rtl_24.png
gtk/stock-icons/stock_undo_rtl_16.png :
gtk/stock-icons/stock_undo_rtl_24.png :
readded as binary
Sat Jul 19 22:39:24 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolitem.c (gtk_tool_item_size_request): remove
......
2003-07-20 Hans Breuer <hans@breuer.org>
* makefile.msc : new file to build it all
* Makefile.am : ... added to EXTRA_DIST
* gdk/makefile.msc gtk/stock-icons/makefile.msc
gtk/makefile.msc.in tests/makefile.msc : updated
* gdk/gdk.def gtk/gtk.def : export a bunch of new
functions
* gtk/gtkbbox.c : use g_return_val_if_fail() if
there is a value to return
* gtk/gtkfontsel.c gtk/gtkiconfactory.c :
static correctness
* gtk/gtkicontheme.c : ported to use GTimeVal instead of
struct timeval and GTK_DATA_PREFIX instead of GTK_DATADIR
* gtk/gtkicontheme.c : use HAVE_LC_MESSAGES
* gtk/gtkimmulticontext.c : use gtkprivate.h
* gtk/stock-icons/stock_color_picker_25.png
gtk/stock-icons/stock_jump_to_rtl_16.png
gtk/stock-icons/stock_jump_to_rtl_24.png
gtk/stock-icons/stock_redo_rtl_16.png
gtk/stock-icons/stock_redo_rtl_24.png
gtk/stock-icons/stock_undelete_rtl_16.png
gtk/stock-icons/stock_undelete_rtl_24.png
gtk/stock-icons/stock_undo_rtl_16.png :
gtk/stock-icons/stock_undo_rtl_24.png :
readded as binary
Sat Jul 19 22:39:24 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolitem.c (gtk_tool_item_size_request): remove
......
2003-07-20 Hans Breuer <hans@breuer.org>
* makefile.msc : new file to build it all
* Makefile.am : ... added to EXTRA_DIST
* gdk/makefile.msc gtk/stock-icons/makefile.msc
gtk/makefile.msc.in tests/makefile.msc : updated
* gdk/gdk.def gtk/gtk.def : export a bunch of new
functions
* gtk/gtkbbox.c : use g_return_val_if_fail() if
there is a value to return
* gtk/gtkfontsel.c gtk/gtkiconfactory.c :
static correctness
* gtk/gtkicontheme.c : ported to use GTimeVal instead of
struct timeval and GTK_DATA_PREFIX instead of GTK_DATADIR
* gtk/gtkicontheme.c : use HAVE_LC_MESSAGES
* gtk/gtkimmulticontext.c : use gtkprivate.h
* gtk/stock-icons/stock_color_picker_25.png
gtk/stock-icons/stock_jump_to_rtl_16.png
gtk/stock-icons/stock_jump_to_rtl_24.png
gtk/stock-icons/stock_redo_rtl_16.png
gtk/stock-icons/stock_redo_rtl_24.png
gtk/stock-icons/stock_undelete_rtl_16.png
gtk/stock-icons/stock_undelete_rtl_24.png
gtk/stock-icons/stock_undo_rtl_16.png :
gtk/stock-icons/stock_undo_rtl_24.png :
readded as binary
Sat Jul 19 22:39:24 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolitem.c (gtk_tool_item_size_request): remove
......
2003-07-20 Hans Breuer <hans@breuer.org>
* makefile.msc : new file to build it all
* Makefile.am : ... added to EXTRA_DIST
* gdk/makefile.msc gtk/stock-icons/makefile.msc
gtk/makefile.msc.in tests/makefile.msc : updated
* gdk/gdk.def gtk/gtk.def : export a bunch of new
functions
* gtk/gtkbbox.c : use g_return_val_if_fail() if
there is a value to return
* gtk/gtkfontsel.c gtk/gtkiconfactory.c :
static correctness
* gtk/gtkicontheme.c : ported to use GTimeVal instead of
struct timeval and GTK_DATA_PREFIX instead of GTK_DATADIR
* gtk/gtkicontheme.c : use HAVE_LC_MESSAGES
* gtk/gtkimmulticontext.c : use gtkprivate.h
* gtk/stock-icons/stock_color_picker_25.png
gtk/stock-icons/stock_jump_to_rtl_16.png
gtk/stock-icons/stock_jump_to_rtl_24.png
gtk/stock-icons/stock_redo_rtl_16.png
gtk/stock-icons/stock_redo_rtl_24.png
gtk/stock-icons/stock_undelete_rtl_16.png
gtk/stock-icons/stock_undelete_rtl_24.png
gtk/stock-icons/stock_undo_rtl_16.png :
gtk/stock-icons/stock_undo_rtl_24.png :
readded as binary
Sat Jul 19 22:39:24 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolitem.c (gtk_tool_item_size_request): remove
......
2003-07-20 Hans Breuer <hans@breuer.org>
* makefile.msc : new file to build it all
* Makefile.am : ... added to EXTRA_DIST
* gdk/makefile.msc gtk/stock-icons/makefile.msc
gtk/makefile.msc.in tests/makefile.msc : updated
* gdk/gdk.def gtk/gtk.def : export a bunch of new
functions
* gtk/gtkbbox.c : use g_return_val_if_fail() if
there is a value to return
* gtk/gtkfontsel.c gtk/gtkiconfactory.c :
static correctness
* gtk/gtkicontheme.c : ported to use GTimeVal instead of
struct timeval and GTK_DATA_PREFIX instead of GTK_DATADIR
* gtk/gtkicontheme.c : use HAVE_LC_MESSAGES
* gtk/gtkimmulticontext.c : use gtkprivate.h
* gtk/stock-icons/stock_color_picker_25.png
gtk/stock-icons/stock_jump_to_rtl_16.png
gtk/stock-icons/stock_jump_to_rtl_24.png
gtk/stock-icons/stock_redo_rtl_16.png
gtk/stock-icons/stock_redo_rtl_24.png
gtk/stock-icons/stock_undelete_rtl_16.png
gtk/stock-icons/stock_undelete_rtl_24.png
gtk/stock-icons/stock_undo_rtl_16.png :
gtk/stock-icons/stock_undo_rtl_24.png :
readded as binary
Sat Jul 19 22:39:24 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolitem.c (gtk_tool_item_size_request): remove
......
......@@ -16,6 +16,7 @@ EXTRA_DIST = \
README.cvs-commits \
README.win32 \
config.h.win32 \
makefile.msc \
gtk-zip.sh.in \
sanitize-la.sh \
po/README.translators \
......
......@@ -74,8 +74,8 @@ EXPORTS
gdk_display_keyboard_ungrab
gdk_display_list_devices
gdk_display_manager_get
gdk_display_manager_get_type
gdk_display_manager_get_default_display
gdk_display_manager_get_type
gdk_display_manager_list_displays
gdk_display_manager_set_default_display
gdk_display_open
......@@ -411,6 +411,7 @@ EXPORTS
gdk_text_height
gdk_text_measure
gdk_text_property_to_text_list
gdk_text_property_to_text_list_for_display
gdk_text_property_to_utf8_list
gdk_text_property_to_utf8_list_for_display
gdk_text_width
......@@ -544,3 +545,4 @@ EXPORTS
gdk_window_withdraw
gdk_wm_decoration_get_type
gdk_wm_function_get_type
......@@ -6,7 +6,7 @@
## There is no install target, you have to decide where and
## how to install for yourself.
TOP = ../..
TOP = ..\..
!INCLUDE $(TOP)/glib/build/win32/make.msc
# Location of the Wintab toolkit. Downloadable from http://www.pointing.com.
......@@ -44,7 +44,8 @@ CFLAGS = -FImsvc_recommended_pragmas.h -I . -I .. \
$(GLIB_CFLAGS) $(PANGO_CFLAGS) -I ../gdk-pixbuf \
$(G_DEBUGGING) -DHAVE_CONFIG_H -DGDK_ENABLE_BROKEN -DGDK_VERSION=\"$(GTK_VER)\"
EXTRALIBS = $(WTKIT)\lib\i386\wntab32x.lib $(GLIB_LIBS) \
..\gdk-pixbuf\gdk_pixbuf-$(GDK_PIXBUF_VER).lib $(PANGOWIN32_LIBS)
..\gdk-pixbuf\gdk_pixbuf-$(GDK_PIXBUF_VER).lib \
$(PANGOWIN32_LIBS) $(INTL_LIBS)
gdk-win32-backend :
cd win32
......@@ -56,8 +57,10 @@ all: \
gdkconfig.h \
gdkenumtypes.h \
gdkenumtypes.c \
gdkmarshalers.h \
gdkmarshalers.c \
gdk-win32-backend \
gdk-win32-$(GTK_VER).dll \
libgdk-win32-$(GTK_VER)-0.dll \
testgdk.exe \
gdk-win32-$(GTK_VER)s.lib \
# gdk-x11-$(GTK_VER).dll \
......@@ -67,6 +70,8 @@ gdk_OBJECTS = \
gdkcolor.obj \
gdkcursor.obj \
gdkdisplay.obj \
gdkdisplaymanager.obj \
gdkdnd.obj \
gdkdraw.obj \
gdkenumtypes.obj \
gdkevents.obj \
......@@ -74,6 +79,7 @@ gdk_OBJECTS = \
gdkgc.obj \
gdkglobals.obj \
gdkimage.obj \
gdkkeynames.obj \
gdkkeys.obj \
gdkkeyuni.obj \
gdkpango.obj \
......@@ -114,6 +120,13 @@ gdk_public_h_sources = \
gdkvisual.h \
gdkwindow.h \
# private marshalers
gdkmarshalers.h : gdkmarshalers.list
$(GLIB)\gobject\glib-genmarshal --prefix=gdk_marshal gdkmarshalers.list --header >>gdkmarshalers.h
gdkmarshalers.c : gdkmarshalers.list
$(GLIB)\gobject\glib-genmarshal --prefix=gdk_marshal gdkmarshalers.list --body >gdkmarshalers.c
gdkenumtypes.h: $(gdk_public_h_sources) makeenums.pl
$(PERL) makeenums.pl include $(gdk_public_h_sources) > gdkenumtypes.h
......@@ -126,8 +139,10 @@ gdkenumtypes.c: $(gdk_public_h_sources) makeenums.pl
gdkconfig.h : gdkconfig.h.win32
copy gdkconfig.h.win32 gdkconfig.h
gdk-win32-$(GTK_VER).dll : $(gdk_OBJECTS) gdk.def win32\gdk-win32.lib
$(CC) $(CFLAGS) -LD -Fegdk-win32-$(GTK_VER).dll $(gdk_OBJECTS) win32\gdk-win32.lib $(EXTRALIBS) gdi32.lib user32.lib imm32.lib shell32.lib ole32.lib uuid.lib win32\gdk.res $(LDFLAGS) /def:gdk.def
libgdk-win32-$(GTK_VER)-0.dll : $(gdk_OBJECTS) gdk.def win32\gdk-win32.lib
$(CC) $(CFLAGS) -LD -Fe$@ $(gdk_OBJECTS) win32\gdk-win32.lib $(EXTRALIBS) \
gdi32.lib user32.lib imm32.lib shell32.lib ole32.lib uuid.lib win32\gdk.res \
$(LDFLAGS) /implib:gdk-win32-$(GTK_VER).lib /def:gdk.def
gdk-win32-$(GTK_VER)s.lib : $(gdk_OBJECTS)
lib /out:gdk-win32-$(GTK_VER)s.lib $(gdk_OBJECTS) win32\gdk-win32.lib
......@@ -137,13 +152,15 @@ gdk-x11-$(GTK_VER).dll : $(gdk_OBJECTS) gdk.def x11\gdk-x11.lib
$(PANGO)\pango\pangox-$(PANGO_VER).lib \
x11\gdk-x11.lib $(X11_LIBS) $(EXTRALIBS) user32.lib $(LDFLAGS) /def:gdk.def
testgdk.exe : gdk-win32-$(GTK_VER).dll testgdk.obj
testgdk.exe : libgdk-win32-$(GTK_VER)-0.dll testgdk.obj
$(CC) -Fetestgdk.exe testgdk.obj gdk-win32-$(GTK_VER).lib $(EXTRALIBS) $(LDFLAGS)
.c.obj :
$(CC) $(CFLAGS) -GD -c -DGDK_COMPILATION -DG_LOG_DOMAIN=\"Gdk\" $<
clean::
del gdkmarshalers.c
del gdkmarshalers.h
del *.dll
del *.obj
del *.lib
......
......@@ -276,8 +276,10 @@ _gdk_events_init (void)
LANG_LITHUANIAN,
LANG_VIETNAMESE,
LANG_AFRIKAANS,
LANG_FAEROESE,
LANG_SWAHILI
LANG_FAEROESE
#ifdef LANG_SWAHILI
,LANG_SWAHILI
#endif
};
gdk_ping_msg = RegisterWindowMessage ("gdk-ping");
......
This diff is collapsed.
......@@ -343,8 +343,8 @@ gtk_button_box_get_child_secondary (GtkButtonBox *widget,
GList *list;
GtkBoxChild *child_info;
g_return_if_fail (GTK_IS_BUTTON_BOX (widget));
g_return_if_fail (GTK_IS_WIDGET (child));
g_return_val_if_fail (GTK_IS_BUTTON_BOX (widget), FALSE);
g_return_val_if_fail (GTK_IS_WIDGET (child), FALSE);
child_info = NULL;
list = GTK_BOX (widget)->children;
......
......@@ -1053,7 +1053,7 @@ gtk_font_selection_update_preview (GtkFontSelection *fontsel)
gtk_editable_set_position (GTK_EDITABLE (preview_entry), 0);
}
GdkFont*
static GdkFont*
gtk_font_selection_get_font_internal (GtkFontSelection *fontsel)
{
if (!fontsel->font)
......
......@@ -995,7 +995,7 @@ icon_sizes_init_for_settings (GtkSettings *settings)
icon_size_set_all_from_settings (settings);
}
gboolean
static gboolean
icon_size_lookup_intern (GtkSettings *settings,
GtkIconSize size,
gint *widthp,
......
......@@ -17,18 +17,28 @@
* Boston, MA 02111-1307, USA.
*/
#include <sys/time.h>
#include "config.h"
#include <sys/types.h>
#include <sys/stat.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <string.h>
#include <stdlib.h>
#include <glib.h>
#ifdef G_OS_WIN32
#ifndef S_ISDIR
#define S_ISDIR(mode) ((mode)&_S_IFDIR)
#endif
#endif /* G_OS_WIN32 */
#include "gtkicontheme.h"
#include "gtkiconthemeparser.h"
#include "gtkintl.h"
#include "gtksettings.h"
#include "gtkprivate.h"
#define DEFAULT_THEME_NAME "hicolor"
......@@ -514,8 +524,8 @@ gtk_icon_theme_init (GtkIconTheme *icon_theme)
priv->search_path[0] = g_build_filename (g_get_home_dir (),
".icons",
NULL);
priv->search_path[1] = g_strdup (GTK_DATADIR "/pixmaps");
priv->search_path[2] = g_strdup (GTK_DATADIR "/icons");
priv->search_path[1] = g_build_filename (GTK_DATA_PREFIX, "pixmaps", NULL);
priv->search_path[2] = g_build_filename (GTK_DATA_PREFIX, "icons", NULL);
priv->search_path[3] = g_strdup ("/usr/share/icons");
priv->search_path[4] = g_strdup ("/usr/share/pixmaps");
priv->search_path_len = 5;
......@@ -920,7 +930,7 @@ load_themes (GtkIconTheme *icon_theme)
char *abs_file;
UnthemedIcon *unthemed_icon;
IconSuffix old_suffix, new_suffix;
struct timeval tv;
GTimeVal tv;
priv = icon_theme->priv;
......@@ -1008,7 +1018,7 @@ load_themes (GtkIconTheme *icon_theme)
priv->themes_valid = TRUE;
gettimeofday(&tv, NULL);
g_get_current_time(&tv);
priv->last_stat_time = tv.tv_sec;
}
......@@ -1016,11 +1026,11 @@ static void
ensure_valid_themes (GtkIconTheme *icon_theme)
{
GtkIconThemePrivate *priv = icon_theme->priv;
struct timeval tv;
GTimeVal tv;
if (priv->themes_valid)
{
gettimeofday(&tv, NULL);
g_get_current_time(&tv);
if (ABS (tv.tv_sec - priv->last_stat_time) > 5)
gtk_icon_theme_rescan_if_needed (icon_theme);
......@@ -1367,7 +1377,7 @@ gtk_icon_theme_rescan_if_needed (GtkIconTheme *icon_theme)
GList *d;
int stat_res;
struct stat stat_buf;
struct timeval tv;
GTimeVal tv;
g_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), FALSE);
......@@ -1393,7 +1403,7 @@ gtk_icon_theme_rescan_if_needed (GtkIconTheme *icon_theme)
return TRUE;
}
gettimeofday (&tv, NULL);
g_get_current_time (&tv);
priv->last_stat_time = tv.tv_sec;
return FALSE;
......
......@@ -17,6 +17,8 @@
* Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include <string.h>
#include <locale.h>
#include <stdlib.h>
......@@ -762,7 +764,11 @@ calculate_locale (GtkIconThemeFile *df)
{
char *p, *lang;
#ifdef HAVE_LC_MESSAGES
lang = g_strdup (setlocale (LC_MESSAGES, NULL));
#else
lang = g_strdup (setlocale (LC_CTYPE, NULL));
#endif
if (lang)
{
......
......@@ -26,6 +26,7 @@
#include "gtkimmodule.h"
#include "gtkradiomenuitem.h"
#include "gtkintl.h"
#include "gtkprivate.h"
static void gtk_im_multicontext_class_init (GtkIMMulticontextClass *class);
static void gtk_im_multicontext_init (GtkIMMulticontext *im_multicontext);
......
......@@ -47,7 +47,7 @@ all : \
..\config.h \
generated \
gtk-stocks-icons \
gtk-win32-$(GTK_VER).dll \
libgtk-win32-$(GTK_VER)-0.dll \
gtk-query-immodules-$(GTK_VER).exe \
# gtk-win32-$(GTK_VER)s.lib \
# gtk-x11-$(GTK_VER).dll
......@@ -69,6 +69,7 @@ gtk_OBJECTS = \
gtkbutton.obj \
gtkcalendar.obj \
gtkcelleditable.obj \
gtkcelllayout.obj \
gtkcellrenderer.obj \
gtkcellrenderertext.obj \
gtkcellrenderertoggle.obj \
......@@ -77,6 +78,7 @@ gtk_OBJECTS = \
gtkcheckmenuitem.obj \
gtkclipboard.obj \
gtkclist.obj \
gtkcolorbutton.obj \
gtkcolorsel.obj \
gtkcolorseldialog.obj \
gtkcombo.obj \
......@@ -88,10 +90,13 @@ gtk_OBJECTS = \
gtkdrawingarea.obj \
gtkeditable.obj \
gtkentry.obj \
gtkentrycompletion.obj \
gtkeventbox.obj \
gtkexpander.obj \
gtkfilesel.obj \
gtkfixed.obj \
gtkfontsel.obj \
gtkfontbutton.obj \
gtkframe.obj \
gtkgamma.obj \
gtkgc.obj \
......@@ -105,6 +110,8 @@ gtk_OBJECTS = \
gtkhseparator.obj \
gtkhsv.obj \
gtkiconfactory.obj \
gtkicontheme.obj \
gtkiconthemeparser.obj \
gtkimage.obj \
gtkimagemenuitem.obj \
gtkimcontext.obj \
......@@ -141,6 +148,7 @@ gtk_OBJECTS = \
gtkprogress.obj \
gtkprogressbar.obj \
gtkradiobutton.obj \
gtkradiotoolbutton.obj \
gtkradiomenuitem.obj \
gtkrange.obj \
gtkrbtree.obj \
......@@ -152,6 +160,7 @@ gtk_OBJECTS = \
gtkselection.obj \
gtkseparator.obj \
gtkseparatormenuitem.obj \
gtkseparatortoolitem.obj \
gtksettings.obj \
gtksignal.obj \
gtksizegroup.obj \
......@@ -179,13 +188,17 @@ gtk_OBJECTS = \
gtkthemes.obj \
gtktipsquery.obj \
gtktogglebutton.obj \
gtktoggletoolbutton.obj \
gtktoolbar.obj \
gtktoolbutton.obj \
gtktoolitem.obj \
gtktooltips.obj \
gtktree.obj \
gtktreedatalist.obj \
gtktreednd.obj \
gtktreeitem.obj \
gtktreemodel.obj \
gtktreemodelfilter.obj \
gtktreemodelsort.obj \
gtktreeselection.obj \
gtktreesortable.obj \
......@@ -211,42 +224,49 @@ gtk_public_h_sources = \
gtk.h \
gtkaccelgroup.h \
gtkaccellabel.h \
gtkaccelmap.h \
gtkaccessible.h \
gtkadjustment.h \
gtkalignment.h \
gtkarrow.h \
gtkaspectframe.h \
gtkbbox.h \
gtkbin.h \
gtkbindings.h \
gtkbbox.h \
gtkbox.h \
gtkbutton.h \
gtkcalendar.h \
gtkcelleditable.h \
gtkcelllayout.h \
gtkcellrenderer.h \
gtkcellrendererpixbuf.h \
gtkcellrenderertext.h \
gtkcellrenderertoggle.h \
gtkcheckbutton.h \
gtkcheckmenuitem.h \
gtkclipboard.h \
gtkclist.h \
gtkclipboard.h \
gtkcolorbutton.h \
gtkcolorsel.h \
gtkcolorseldialog.h \
gtkcombo.h \
gtkcontainer.h \
gtkctree.h \
gtkcurve.h \
gtkcelleditable.h \
gtkcellrenderer.h \
gtkcellrenderertext.h \
gtkcellrenderertoggle.h \
gtkcellrendererpixbuf.h \
gtkdebug.h \
gtkdialog.h \
gtkdnd.h \
gtkdrawingarea.h \
gtkeditable.h \
gtkentry.h \
gtkentrycompletion.h \
gtkenums.h \
gtkeventbox.h \
gtkexpander.h \
gtkfilesel.h \
gtkfixed.h \
gtkfontbutton.h \
gtkfontsel.h \
gtkframe.h \
gtkgamma.h \
......@@ -261,8 +281,11 @@ gtk_public_h_sources = \
gtkhseparator.h \
gtkhsv.h \
gtkiconfactory.h \
gtkicontheme.h \
gtkimage.h \
gtkimagemenuitem.h \
gtkimcontext.h \
gtkimcontextsimple.h \
gtkimmodule.h \
gtkimmulticontext.h \
gtkinputdialog.h \
......@@ -283,8 +306,8 @@ gtk_public_h_sources = \
gtkmessagedialog.h \
gtkmisc.h \
gtknotebook.h \
gtkoldeditable.h \
gtkobject.h \
gtkoldeditable.h \
gtkoptionmenu.h \
gtkpaned.h \
gtkpixmap.h \
......@@ -295,6 +318,7 @@ gtk_public_h_sources = \
gtkprogressbar.h \
gtkradiobutton.h \
gtkradiomenuitem.h \
gtkradiotoolbutton.h \
gtkrange.h \
gtkrc.h \
gtkruler.h \
......@@ -303,15 +327,20 @@ gtk_public_h_sources = \
gtkscrolledwindow.h \
gtkselection.h \
gtkseparator.h \
gtkseparatormenuitem.h \
gtkseparatortoolitem.h \
gtksettings.h \
gtksignal.h \
gtksizegroup.h \
gtksignal.h \
gtksocket.h \
gtkspinbutton.h \
gtkstyle.h \
gtkstatusbar.h \
gtkstock.h \
gtkstyle.h \
gtktable.h \
gtktearoffmenuitem.h \
gtktext.h \
gtktextbuffer.h \
gtktextchild.h \
gtktextdisplay.h \
......@@ -321,14 +350,18 @@ gtk_public_h_sources = \
gtktexttag.h \
gtktexttagtable.h \
gtktextview.h \
gtktext.h \
gtktipsquery.h \
gtktogglebutton.h \
gtktoggletoolbutton.h \
gtktoolbar.h \
gtktoolbutton.h \
gtktoolitem.h \
gtktooltips.h \
gtktree.h \
gtktreednd.h \
gtktreeitem.h \
gtktreemodel.h \
gtktreemodelfilter.h \
gtktreemodelsort.h \
gtktreeselection.h \
gtktreesortable.h \
......@@ -420,8 +453,11 @@ gtksignal.obj : gtksignal.c gtkmarshal.c gtkmarshal.h
#
# Linking:
#
gtk-win32-$(GTK_VER).dll : $(gtk_OBJECTS) gtk.def
$(CC) $(CFLAGS) -LD -Fm -Fegtk-win32-$(GTK_VER).dll $(gtk_OBJECTS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(INTL_LIBS) $(GLIB_LIBS) gdi32.lib user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:gtk.def
libgtk-win32-$(GTK_VER)-0.dll : $(gtk_OBJECTS) gtk.def
$(CC) $(CFLAGS) -LD -Fm -Fe$@ $(gtk_OBJECTS) \
$(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(INTL_LIBS) $(GLIB_LIBS) \
gdi32.lib user32.lib advapi32.lib wsock32.lib \
$(LDFLAGS) /implib:gtk-win32-$(GTK_VER).lib /def:gtk.def
gtk-win32-$(GTK_VER)s.lib : $(gtk_OBJECTS)
lib /out:gtk-win32-$(GTK_VER)s.lib $(gtk_OBJECTS)
......
## Makefile for building the Gtk+ dlls with Microsoft C
## Use: nmake -f makefile.msc
PARTS = gdk-pixbuf gdk gtk tests
all : \
config.h \
sub-all
sub-all:
for %d in ($(PARTS)) do nmake -nologo -f makefile.msc sub-one THIS=%d TARGET=all
clean : sub-clean
sub-clean:
for %d in ($(PARTS)) do nmake -nologo -f makefile.msc sub-one THIS=%d TARGET=clean
sub-one:
@cd $(THIS)
@nmake -nologo -f makefile.msc $(TARGET)
@cd ..
config.h: config.h.win32
copy config.h.win32 config.h
......@@ -65,7 +65,7 @@ EXTRA_OBJETCS = prop-editor.obj
EXTRA_OBJETCS = prop-editor.obj
!ENDIF
$(TESTAPP).exe : ../gtk/gtk-win32-$(GTK_VER).dll $(TESTAPP).obj
$(TESTAPP).exe : ../gtk/gtk-win32-$(GTK_VER).lib $(TESTAPP).obj
$(CC) $(CFLAGS) $(TESTAPP).obj $(EXTRA_OBJETCS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(LDFLAGS)
$(TESTAPP).obj : $(TESTAPP).c
......
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