summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2017-10-03 18:26:40 +0200
committerAki <nthirtyone@gmail.com>2017-10-03 18:26:40 +0200
commit854b045d153ef8b560093afc1530763e07ff99c3 (patch)
tree448d5beb3f77e4a25be87b75dcdfcad142598db6
parentcb6a5f72859d2fdeebaa16998e3eef583cfa7c21 (diff)
parent832fd64e1011ace02139843b4c2a871b25376866 (diff)
downloadroflnauts-854b045d153ef8b560093afc1530763e07ff99c3.zip
roflnauts-854b045d153ef8b560093afc1530763e07ff99c3.tar.gz
roflnauts-854b045d153ef8b560093afc1530763e07ff99c3.tar.bz2
Merge branch 'build'
-rw-r--r--.gitignore8
-rw-r--r--Makefile17
-rw-r--r--conf.lua15
3 files changed, 25 insertions, 15 deletions
diff --git a/.gitignore b/.gitignore
index 268094b..9e67eca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,4 @@
-*.xcf
-*.sfs
*.swp
*.swo
*~
-*.wav
-.project
-.backup/
-run.bat
-run.sh
+releases/
diff --git a/Makefile b/Makefile
index ad749e8..e1a044a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,16 @@
-all:
- zip not-nautz lib/object/Object.lua not/*.lua config/maps/*.lua config/menus/*.lua config/*.lua assets/*.png assets/sounds/*.ogg assets/platforms/*.png assets/nauts/*.png assets/music/*.ogg assets/decorations/*.png assets/backgrounds/*.png *.lua gamecontrollerdb.txt settings.default
+TOOL=love-release
+FLAGS=-x Makefile -x .md
+
+windows:
+ $(TOOL) -W 32 $(FLAGS)
+
+love:
+ $(TOOL) $(FLAGS)
+
+mac:
+ $(TOOL) -M $(FLAGS)
+
+all: windows love mac
clean:
- rm ../not-nautz.love \ No newline at end of file
+ rm releases/*
diff --git a/conf.lua b/conf.lua
index 032f41b..f25f3dc 100644
--- a/conf.lua
+++ b/conf.lua
@@ -1,12 +1,17 @@
--- Game configuration
-function love.conf(t)
+function love.conf (t)
t.title = "Roflnauts 2"
t.version = "0.10.2"
t.window.width = 320
t.window.height = 180
- -- t.window.borderless = true
t.identity = "not-nautz"
- -- t.window.fullscreentype = "desktop"
- -- t.window.fullscreen = true
t.console = false
+ t.releases = {
+ title = t.title,
+ identifier = t.identity,
+ package = "roflnauts",
+ author = "The Roflnauts 2 Team",
+ email = "nthirtyone@gmail.com",
+ description = "Fan made sequel to Roflnauts.",
+ homepage = "https://github.com/nthirtyone/roflnauts"
+ }
end