From b91c810871955f8ef1ac5cc48468f4dc3f6a38d9 Mon Sep 17 00:00:00 2001 From: Paul Ramsey Date: Fri, 18 Dec 2009 06:39:48 +0000 Subject: [PATCH] Add in icon and resource information for Win32 GUI git-svn-id: http://svn.osgeo.org/postgis/trunk@5024 b70326c6-7e19-0410-871a-916f4a2858ee --- configure.ac | 7 +++++-- loader/Makefile.in | 14 +++++++++----- loader/shp2pgsql-gui.ico | Bin 0 -> 12638 bytes loader/shp2pgsql-gui.rc | 25 +++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 loader/shp2pgsql-gui.ico create mode 100644 loader/shp2pgsql-gui.rc diff --git a/configure.ac b/configure.ac index 02350fc78..77f5860e4 100644 --- a/configure.ac +++ b/configure.ac @@ -569,7 +569,9 @@ if test "x$GUI" = "xyes"; then dnl Add -mwindows to MinGW GUI build case $host in *mingw32*) - GTK_WIN32="-mwindows" + GTK_WIN32_FLAGS=-mwindows + GTK_WIN32_RES=shp2pgsql-gui.res + GTK_WIN32_BUILD=gui-win32 ;; esac fi @@ -578,7 +580,8 @@ fi AC_SUBST([GTK_CFLAGS]) AC_SUBST([GTK_LIBS]) -AC_SUBST([GTK_WIN32]) +AC_SUBST([GTK_WIN32_FLAGS]) +AC_SUBST([GTK_WIN32_RES]) AC_SUBST([GTK_BUILD]) diff --git a/loader/Makefile.in b/loader/Makefile.in index deb51faed..642f00931 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -44,7 +44,8 @@ LIBLWGEOM=../liblwgeom/liblwgeom.a # GTK includes and libraries GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ -GTK_WIN32 = @GTK_WIN32@ +GTK_WIN32_FLAGS = @GTK_WIN32_FLAGS@ +GTK_WIN32_RES = @GTK_WIN32_RES@ # If REGRESS=1 passed as a parameter, change the default install paths # so that no prefix is included. This allows us to relocate to a temporary @@ -59,7 +60,10 @@ endif # The real parts of the Makefile all: $(SHP2PGSQL-CLI) $(PGSQL2SHP) @GTK_BUILD@ -gui: $(SHP2PGSQL-GUI) $(SHP2PGSQL-CLI) +gui: $(SHP2PGSQL-GUI) $(SHP2PGSQL-CLI) @GTK_WIN32_RES@ + +shp2pgsql-gui.res: shp2pgsql-gui.rc shp2pgsql-gui.ico + windres $< -O coff -o $@ # liblwgeom.a dependency to allow "make install" in # the loader/ subdirectory to work @@ -81,8 +85,8 @@ $(SHP2PGSQL-CLI): stringbuffer.o shpopen.o dbfopen.o shp2pgsql-core.o shp2pgsql- shp2pgsql-gui.o: shp2pgsql-gui.c $(CC) $(CFLAGS) $(PGSQL_FE_CPPFLAGS) $(GTK_CFLAGS) -o $@ -c shp2pgsql-gui.c -$(SHP2PGSQL-GUI): stringbuffer.o shpopen.o dbfopen.o shp2pgsql-core.o shp2pgsql-gui.o $(LIBLWGEOM) - $(CC) $(CFLAGS) $(GTK_WIN32) $^ -o $@ $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) -lm +$(SHP2PGSQL-GUI): stringbuffer.o shpopen.o dbfopen.o shp2pgsql-core.o shp2pgsql-gui.o $(LIBLWGEOM) $(GTK_WIN32_RES) + $(CC) $(CFLAGS) $(GTK_WIN32_FLAGS) $^ -o $@ $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) -lm install: all @mkdir -p $(DESTDIR)$(bindir) @@ -94,5 +98,5 @@ uninstall: @rm -f $(DESTDIR)$(bindir)/$(SHP2PGSQL-CLI) clean: - @rm -f *.o $(SHP2PGSQL-CLI) $(PGSQL2SHP) + @rm -f *.o $(SHP2PGSQL-CLI) $(PGSQL2SHP) $(GTK_WIN32_RES) diff --git a/loader/shp2pgsql-gui.ico b/loader/shp2pgsql-gui.ico new file mode 100644 index 0000000000000000000000000000000000000000..21550187c4fdccca5c9744382c1e00a53c6339c1 GIT binary patch literal 12638 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 literal 0 HcmV?d00001 diff --git a/loader/shp2pgsql-gui.rc b/loader/shp2pgsql-gui.rc new file mode 100644 index 000000000..5a768a071 --- /dev/null +++ b/loader/shp2pgsql-gui.rc @@ -0,0 +1,25 @@ +id ICON "shp2pgsql-gui.ico" +1 VERSIONINFO +FILEVERSION 1,0,0,0 +PRODUCTVERSION 1,0,0,0 +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" + BEGIN + VALUE "CompanyName", "Open Source Geospatial Consortium" + VALUE "FileDescription", "Shape to PostGIS Converter" + VALUE "FileVersion", "1.0" + VALUE "InternalName", "shp2pgsql-gui" + VALUE "LegalCopyright", "Copyright (c) OSGeo" + VALUE "OriginalFilename", "shp2pgsql-gui.exe" + VALUE "ProductName", "Shp2PgSQL-GUI" + VALUE "ProductVersion", "1.0" + END + END + + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END -- 2.50.1