X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fautomake.mk;h=e0e9cab0c796da219a5d515ee7d627f893d2ac37;hb=faa4f310af58bc1dfd56be0575745c91a59d88b3;hp=ad44170170f7546b271ab3279bfd16065523b6a6;hpb=8fedd452487aaee9ed4be69927f6895c9623e7ce;p=pspp

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index ad44170170..e0e9cab0c7 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -73,7 +73,8 @@ if building_gui
 
 EXTRA_DIST += \
 	src/ui/gui/marshaller-list \
-	src/ui/gui/pspplogo.svg
+	src/ui/gui/pspplogo.svg \
+	src/ui/gui/pspp.rc.in
 
 src_ui_gui_psppire_CPPFLAGS=
 
@@ -97,6 +98,8 @@ src_ui_gui_psppire_LDFLAGS = \
 	$(PG_LDFLAGS)
 
 
+
+
 if RELOCATABLE_VIA_LD
 src_ui_gui_psppire_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(bindir)`
 else
@@ -118,6 +121,11 @@ src_ui_gui_psppire_LDADD = \
 	$(LIBINTL) \
 	$(GSL_LIBS)
 
+if host_is_w32
+src_ui_gui_psppire_LDADD += src/ui/gui/pspp.res
+src_ui_gui_psppire_CFLAGS += -mwindows -mwin32
+endif
+
 
 src_ui_gui_spreadsheet_test_LDADD = \
 	src/libpspp-core.la \
@@ -213,6 +221,10 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/windows-menu.c \
 	src/ui/gui/windows-menu.h
 
+src/ui/gui/pspp.rc: src/ui/gui/pspp.rc.in
+	@$(MKDIR_P) src/ui/gui
+	sed -e 's/%version%/'$(PACKAGE_VERSION)'/' $< > $@
+
 noinst_LTLIBRARIES += src/ui/gui/libwidgets-essential.la
 
 src_ui_gui_libwidgets_essential_la_SOURCES = \
@@ -332,6 +344,8 @@ src_ui_gui_libwidgets_essential_la_SOURCES = \
 	src/ui/gui/psppire-text-file.h \
 	src/ui/gui/psppire-val-chooser.c \
 	src/ui/gui/psppire-val-chooser.h \
+	src/ui/gui/psppire-var-info.c \
+	src/ui/gui/psppire-var-info.h \
 	src/ui/gui/psppire-var-ptr.c \
 	src/ui/gui/psppire-var-ptr.h \
 	src/ui/gui/psppire-var-view.c \
@@ -414,6 +428,11 @@ EXTRA_DIST += src/ui/gui/include/gtk/gtk.in.h src/ui/gui/resources.xml
 
 include $(top_srcdir)/src/ui/gui/icons/automake.mk
 
+src/ui/gui/pspp.res: src/ui/gui/pspp.rc $(w32_icons)
+	@$(MKDIR_P) src/ui/gui
+	$(host_triplet)-windres  $< -O coff -o $@
+
+
 UNINSTALL_DATA_HOOKS += update-icon-cache
 INSTALL_DATA_HOOKS += update-icon-cache