Commit 32392cbc authored by Vincent Geddes's avatar Vincent Geddes

Check for windres on win32. Define version using separate number

	* configure.ac: Check for windres on win32. Define version using
	  separate number components (major, minor, micro).
	  
	* data/icons/glade-3.ico: New application icon in win32 ICO format.
	
	* gladeui/gladeui.rc.in, gladeui/Makefile.am, src/glade-3.rc.in,
	  src/Makefile.am: Added win32 resources for the libgladeui dll
	  and the application executable.

svn path=/trunk/; revision=1254
parent 5a6c3b1a
2007-04-16 Vincent Geddes <vincent.geddes@gmail.com>
* configure.ac: Check for windres on win32. Define version using
separate numbered components (major, minor, micro).
* data/icons/glade-3.ico: New application icon in win32 ICO format.
* gladeui/gladeui.rc.in, gladeui/Makefile.am, src/glade-3.rc.in,
src/Makefile.am: Added win32 resources for the libgladeui dll
and the application executable.
2007-04-16 Juan Pablo Ugarte <juanpablougarte@gmail.com>
* plugins/gtk+/glade-gtk.c: stop GtkFileChooserDefault "hierarchy-changed"
......@@ -11,7 +22,7 @@
plugins/gtk+/icons/16x16/widget-gtk-filechooserwidget.png: new icons,
they are the same as GtkFileChooserDialog but without the borders :)
2007-04-12 Vincent Geddes <vincent.geddes@gmail.com>
2007-04-12 Vincent Geddes <vincent.geddes@gmail.com>
* gladeui/Makefile.am: Auto-generate `gladeui.def' for DLL symbol
exports. Remove -DINSIDE_LIBGLADEUI from libgladeui_1_la_CPPFLAGS.
......
......@@ -32,6 +32,6 @@ libgladepython_la_LIBADD = \
$(PYTHON_EXTRA_LIBS) \
$(PYGTK_LIBS)
if WITH_WIN32
if PLATFORM_WIN32
libgladepython_la_LDFLAGS += -no-undefined
endif
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
AC_INIT([glade3], [3.1.5],
m4_define(glade_major_version, 3)
m4_define(glade_minor_version, 3)
m4_define(glade_micro_version, 0)
m4_define(glade_version, glade_major_version.glade_minor_version.glade_micro_version)
AC_INIT([glade3], [glade_version],
[http://bugzilla.gnome.org/enter_bug.cgi?product=glade3])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR([gladeui/glade.h])
AC_CONFIG_MACRO_DIR([m4])
AC_DEFINE(GLADE_MAJOR_VERSION, glade_major_version, [Glade major version])
AC_SUBST(GLADE_MAJOR_VERSION, glade_major_version)
AC_DEFINE(GLADE_MINOR_VERSION, glade_minor_version, [Glade minor version])
AC_SUBST(GLADE_MINOR_VERSION, glade_minor_version)
AC_DEFINE(GLADE_MICRO_VERSION, glade_micro_version, [Glade micro version])
AC_SUBST(GLADE_MICRO_VERSION, glade_micro_version)
AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2])
......@@ -222,13 +235,20 @@ dnl Check for windows
dnl ================================================================
case $host_os in
*mingw* | pw32* | cygwin*)
win32=yes
platform_win32=yes
;;
*)
win32=no
platform_win32=no
;;
esac
AM_CONDITIONAL(WITH_WIN32, test x"$win32" = "xyes")
AM_CONDITIONAL(PLATFORM_WIN32, test x"$platform_win32" = "xyes")
if test "$platform_win32" = "yes"; then
AC_CHECK_TOOL(WINDRES, windres, no)
if test "$WINDRES" = no; then
AC_MSG_ERROR([*** Could not find an implementation of windres in your PATH.])
fi
fi
dnl ================================================================
dnl Only use -Wall if we have gcc
......@@ -264,7 +284,9 @@ data/icons/hicolor/48x48/apps/Makefile
data/icons/hicolor/scalable/Makefile
data/icons/hicolor/scalable/apps/Makefile
gladeui/Makefile
gladeui/gladeui.rc
src/Makefile
src/glade-3.rc
plugins/Makefile
plugins/gtk+/Makefile
plugins/gtk+/icons/Makefile
......@@ -293,5 +315,4 @@ Configuration:
GTK+ UNIX Print Widgets: ${have_unix_print}
GnomeUI Widgets: ${have_gnome}
Python Binding: ${have_python}
Glade User Manual: ${gdu_cv_have_gdu}
"
......@@ -20,4 +20,4 @@ pixmapsdir = $(pkgdatadir)/pixmaps
pixmaps_DATA = selector.png devhelp.png plus.png
EXTRA_DIST = $(pixmaps_DATA)
EXTRA_DIST = $(pixmaps_DATA) glade-3.ico
......@@ -14,7 +14,7 @@ lib_LTLIBRARIES = libgladeui-1.la
BUILT_SOURCES = glade-marshallers.c glade-marshallers.h
EXTRA_DIST = atk.xpm glade-marshallers.list
EXTRA_DIST = atk.xpm glade-marshallers.list gladeui.rc.in
# The glade-3 core library
libgladeui_1_la_SOURCES = \
......@@ -116,11 +116,14 @@ libgladeuiinclude_HEADERS = \
fixed_bg.xpm
if WITH_WIN32
libgladeui_1_la_LDFLAGS += -no-undefined -export-symbols gladeui.def
libgladeui_1_la_DEPENDENCIES = gladeui.def
if PLATFORM_WIN32
libgladeui_1_la_LDFLAGS += -no-undefined -Wl,gladeui-win32-res.o -export-symbols gladeui.def
libgladeui_1_la_DEPENDENCIES = gladeui.def gladeui-win32-res.o
endif
gladeui-win32-res.o: gladeui.rc
$(WINDRES) $< $@
# gladeui.def: auto-generated DEF file for linker input
# The routines below will scan the header files and extracts symbol declarations.
# The symbol 'custom_get_type' is added manually. It's naming deviates from
......
#include <winver.h>
VS_VERSION_INFO VERSIONINFO
FILEVERSION @GLADE_MAJOR_VERSION@,@GLADE_MINOR_VERSION@,@GLADE_MICRO_VERSION@,0
PRODUCTVERSION @GLADE_MAJOR_VERSION@,@GLADE_MINOR_VERSION@,@GLADE_MICRO_VERSION@,0
FILEFLAGSMASK 0
FILEFLAGS 0
FILEOS VOS__WINDOWS32
FILETYPE VFT_DLL
FILESUBTYPE VFT2_UNKNOWN
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904B0"
BEGIN
VALUE "CompanyName", "The GNOME Foundation"
VALUE "FileDescription", "Glade Interface Designer @GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@.@GLADE_MICRO_VERSION@"
VALUE "FileVersion", "@GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@.@GLADE_MICRO_VERSION@.0"
VALUE "InternalName", "libgladeui-1-5"
VALUE "LegalCopyright", "Copyright 2007 The GNOME Foundation"
VALUE "OriginalFilename", "libgladeui-1-5.dll"
VALUE "ProductName", "Glade Interface Designer"
VALUE "ProductVersion", "@GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@.@GLADE_MICRO_VERSION@"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
......@@ -22,7 +22,7 @@ libgladegnome_la_CFLAGS = \
libgladegnome_la_LDFLAGS = -module -avoid-version $(GNOME_LIBS) $(AM_LDFLAGS)
libgladegnome_la_LIBADD = $(libgladeui) $(GLADE_LIBS)
if WITH_WIN32
if PLATFORM_WIN32
libgladegnome_la_LDFLAGS += -no-undefined
endif
......
......@@ -27,7 +27,7 @@ libgladegtk_la_SOURCES = glade-gtk.c glade-gtk.h
libgladegtk_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
libgladegtk_la_LIBADD = $(libgladeui) $(GTK_LIBS)
if WITH_WIN32
if PLATFORM_WIN32
libgladegtk_la_LDFLAGS += -no-undefined
endif
......
......@@ -22,6 +22,11 @@ glade_3_SOURCES = \
glade-project-window.h \
main.c
if WITH_WIN32
glade_3_LDFLAGS += -mwindows
if PLATFORM_WIN32
glade_3_LDADD += glade-win32-res.o
endif
glade-win32-res.o: glade-3.rc
$(WINDRES) $< $@
EXTRA_DIST = glade-3.rc.in
#include <winver.h>
GLADE_ICON ICON "../data/icons/glade-3.ico"
VS_VERSION_INFO VERSIONINFO
FILEVERSION @GLADE_MAJOR_VERSION@,@GLADE_MINOR_VERSION@,@GLADE_MICRO_VERSION@,0
PRODUCTVERSION @GLADE_MAJOR_VERSION@,@GLADE_MINOR_VERSION@,@GLADE_MICRO_VERSION@,0
FILEOS VOS__WINDOWS32
FILETYPE VFT_APP
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904B0"
BEGIN
VALUE "CompanyName", "The GNOME Foundation"
VALUE "FileDescription", "Glade Interface Designer @GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@.@GLADE_MICRO_VERSION@"
VALUE "FileVersion", "@GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@.@GLADE_MICRO_VERSION@.0"
VALUE "LegalCopyright", "Copyright © 2007 The GNOME Foundation"
VALUE "OriginalFilename", "glade-3.exe"
VALUE "ProductName", "Glade Interface Designer"
VALUE "ProductVersion", "@GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@.@GLADE_MICRO_VERSION@.0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
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