Merge branch 'master' into hjelmeland-patch-1hjelmeland-patch-1

1 files changed, 7 insertions, 1 deletions

diff --git a/makefile b/makefile
index e34f5a9..63d9985 100644..100755
--- a/makefile
+++ b/makefile
@@ -10,7 +10,7 @@
 #   print                  print the build settings
 
 PLAT?= linux
-PLATS= macosx linux win32 mingw freebsd
+PLATS= macosx linux win32 win64 mingw freebsd solaris
 
 all: $(PLAT)
 
@@ -33,6 +33,9 @@ install-both:
         $(MAKE) clean
         @cd src; $(MAKE) $(PLAT) LUAV=5.3
         @cd src; $(MAKE) install LUAV=5.3
+        $(MAKE) clean
+        @cd src; $(MAKE) $(PLAT) LUAV=5.4
+        @cd src; $(MAKE) install LUAV=5.4
 
 install-both-unix:
         $(MAKE) clean
@@ -44,6 +47,9 @@ install-both-unix:
         $(MAKE) clean
         @cd src; $(MAKE) $(PLAT) LUAV=5.3
         @cd src; $(MAKE) install-unix LUAV=5.3
+        $(MAKE) clean
+        @cd src; $(MAKE) $(PLAT) LUAV=5.4
+        @cd src; $(MAKE) install-unix LUAV=5.4
 
 .PHONY: test