summaryrefslogtreecommitdiff
path: root/windows
diff options
context:
space:
mode:
authorRob Kendrick (fatigue) <rjek@netsurf-browser.org>2012-11-03 13:40:34 +0000
committerRob Kendrick (fatigue) <rjek@netsurf-browser.org>2012-11-03 13:40:34 +0000
commit58202b2dfdaffad99dd9183c4efffd34139bdfc1 (patch)
tree38062b26aaac87de886c0651e502449d0f6f4e75 /windows
parent71acc6b1abf2139c4d1019fdddcafd7a022898ec (diff)
downloadnetsurf-58202b2dfdaffad99dd9183c4efffd34139bdfc1.tar.gz
netsurf-58202b2dfdaffad99dd9183c4efffd34139bdfc1.tar.bz2
Try to get Windows building with FatMessages. This approach makes me ill, and may not even work.
Diffstat (limited to 'windows')
-rw-r--r--windows/Makefile.target7
-rw-r--r--windows/res/installer.nsi2
l---------windows/res/messages1
3 files changed, 6 insertions, 4 deletions
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