Add nogame bundle; CMake zips and concats nogame;

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.3.0)
 cmake_policy(SET CMP0063 NEW)
 cmake_policy(SET CMP0079 NEW)
 set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "Minimum macOS deployment version")
@@ -628,6 +628,13 @@ foreach(path ${LOVR_RESOURCES})
   file(WRITE ${output} "const unsigned char ${identifier}[] = {${data}};\nconst unsigned int ${identifier}_len = sizeof(${identifier});\n")
 endforeach()
 
+add_custom_command(TARGET lovr POST_BUILD
+  DEPENDS "etc/nogame"
+  WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/etc/nogame"
+  COMMAND ${CMAKE_COMMAND} -E tar c "${CMAKE_CURRENT_BINARY_DIR}/nogame.zip" --format=zip arg.lua conf.lua main.lua
+  COMMAND ${CMAKE_COMMAND} -E cat "${CMAKE_CURRENT_BINARY_DIR}/nogame.zip" >> $<TARGET_FILE:lovr>
+)
+
 # Add a custom target that is always out of date so libraries are always moved
 add_custom_target(move_files ALL)
 

Tupfile.lua

@@ -450,7 +450,7 @@ src += config.modules.math and 'src/lib/noise/*.c' or nil
 
 -- embed resource files with xxd
 
-res = { 'etc/boot.lua', 'etc/nogame.lua', 'etc/*.ttf', 'etc/shaders/*.glsl' }
+res = { 'etc/boot.lua', 'etc/*.ttf', 'etc/shaders/*.glsl' }
 tup.foreach_rule(res, '^ XD %b^ xxd -i %f > %o', '%f.h')
 
 for i, pattern in ipairs(res) do

etc/boot.lua

@@ -81,8 +81,8 @@ function lovr.boot()
   -- Figure out source archive and main module.  CLI places source at arg[0]
 
   local source, main
-  if cli or not fused then
-    if arg[0] and arg[0]:match('[^/\\]+%.lua$') then
+  if (cli or not fused) and arg[0] then
+    if arg[0]:match('[^/\\]+%.lua$') then
       source = arg[0]:match('[/\\]') and arg[0]:match('(.+)[/\\][^/\\]+$') or '.'
       main = arg[0]:match('[^/\\]+%.lua$')
     else

etc/nogame/arg.lua

@@ -0,0 +1,66 @@
+function lovr.arg(arg)
+  local options = {
+    _help = { short = '-h', long = '--help', help = 'Show help and exit' },
+    _version = { short = '-v', long = '--version', help = 'Show version and exit' },
+    debug = { long = '--debug', help = 'Enable debugging checks and logging' }
+  }
+
+  local shift
+
+  for i, argument in ipairs(arg) do
+    if argument:match('^%-') then
+      for name, option in pairs(options) do
+        if argument == option.short or argument == option.long then
+          arg[name] = true
+          break
+        end
+      end
+    else
+      shift = i
+      break
+    end
+  end
+
+  shift = shift or (#arg + 1)
+
+  for i = 0, #arg do
+    arg[i - shift], arg[i] = arg[i], nil
+  end
+
+  if arg._help then
+    local message = {}
+
+    local list = {}
+    for name, option in pairs(options) do
+      option.name = name
+      table.insert(list, option)
+    end
+
+    table.sort(list, function(a, b) return a.name < b.name end)
+
+    for i, option in ipairs(list) do
+      if option.short and option.long then
+        table.insert(message, ('  %s, %s\t\t%s'):format(option.short, option.long, option.help))
+      else
+        table.insert(message, ('  %s\t\t%s'):format(option.long or option.short, option.help))
+      end
+    end
+
+    table.insert(message, 1, 'usage: lovr [options] [<source>]\n')
+    table.insert(message, 2, 'options:')
+    table.insert(message, '\n<source> can be a Lua file, a folder, or a zip archive')
+    print(table.concat(message, '\n'))
+    os.exit(0)
+  end
+
+  if arg._version then
+    print(('LOVR %d.%d.%d'):format(lovr.getVersion()))
+    os.exit(0)
+  end
+
+  return function(conf)
+    if arg.debug then
+      conf.graphics.debug = true
+    end
+  end
+end

etc/nogame/conf.lua

@@ -0,0 +1,6 @@
+function lovr.conf(t)
+  t.headset.supersample = true
+  t.modules.audio = false
+  t.modules.physics = false
+  t.modules.thread = false
+end

etc/nogame.lua → etc/nogame/main.lua

@@ -1,10 +1,3 @@
-function lovr.conf(t)
-  t.headset.supersample = true
-  t.modules.audio = false
-  t.modules.physics = false
-  t.modules.thread = false
-end
-
 function lovr.load()
   if not lovr.graphics then
     print(string.format('LÖVR %d.%d.%d\nNo game', lovr.getVersion()))