From 58202b2dfdaffad99dd9183c4efffd34139bdfc1 Mon Sep 17 00:00:00 2001 From: "Rob Kendrick (fatigue)" Date: Sat, 3 Nov 2012 13:40:34 +0000 Subject: Try to get Windows building with FatMessages. This approach makes me ill, and may not even work. --- windows/Makefile.target | 7 +++++-- windows/res/installer.nsi | 2 +- windows/res/messages | 1 - 3 files changed, 6 insertions(+), 4 deletions(-) delete mode 120000 windows/res/messages (limited to 'windows') diff --git a/windows/Makefile.target b/windows/Makefile.target index f3589999e..6dca79013 100644 --- a/windows/Makefile.target +++ b/windows/Makefile.target @@ -85,8 +85,11 @@ install-windows: package-windows: netsurf-installer.exe -WIN_RES_OBJ := installer.nsi NetSurf.ico netsurf.png welcome.html default.css messages -WIN_RES_INS_OBJ := $(addprefix windows/res/,$(WIN_RES_OBJ)) +WIN_RES_OBJ := installer.nsi NetSurf.ico netsurf.png welcome.html default.css +WIN_RES_INS_OBJ := $(addprefix windows/res/,$(WIN_RES_OBJ)) $(OBJROOT)/messages + +$(OBJROOT)/messages: resources/FatMessages + $(PERL) utils/split-messages.pl en all < resources/FatMessages > $@ netsurf-installer.exe: $(EXETARGET) $(WIN_RES_INS_OBJ) makensis -V4 -NOCD windows/res/installer.nsi diff --git a/windows/res/installer.nsi b/windows/res/installer.nsi index 9f146873a..1b4ed96de 100644 --- a/windows/res/installer.nsi +++ b/windows/res/installer.nsi @@ -63,7 +63,7 @@ section "install" file /oname=default.css "windows\res\default.css" file /oname=welcome.html "windows\res\welcome.html" file /oname=netsurf.png "windows\res\netsurf.png" - file /oname=messages "windows\res\messages" + file /oname=messages "build-Linux-windows\messages" # Add any other files for the install directory (license files, app data, etc) here # Uninstaller - See function un.onInit and section "uninstall" for configuration diff --git a/windows/res/messages b/windows/res/messages deleted file mode 120000 index f4a4d2bba..000000000 --- a/windows/res/messages +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/en/Messages \ No newline at end of file -- cgit v1.2.3