Skip to content

Commit d3ba686

Browse files
committed
0.15 compatibility
1 parent 27a87ba commit d3ba686

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

main.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ tryMount()
6161
local recursiveWatch = recursiveWatchMaker(watched, mainRealpath)
6262

6363
if hasMain then
64-
if lovr.getOS() == "Android" then
64+
if lovr.system.getOS() == "Android" then
6565
print("Loading a script from the user files directory. To upload a new script, cd to your project directory and run: adb push --sync . " .. target)
6666
end
6767

@@ -143,7 +143,7 @@ else
143143
else
144144
message = message .. "does not contain a main.lua."
145145
end
146-
if lovr.getOS() == "Android" then
146+
if lovr.system.getOS() == "Android" then
147147
message = message .. "\n\nTo upload a " .. ((not hasProject or not atLeastOneFile) and "" or "fixed ")
148148
.. "project,\ncd to your project directory and run:\n"
149149
.. "adb push --sync . " .. target

z_lodrSupport/target.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
-- lodr helper figures out what directory it is we're supposed to be running
2-
if lovr.getOS() == "Android" then
2+
local system = lovr.system or require('lovr.system')
3+
if system.getOS() == "Android" then
34
lovr.filesystem.setIdentity("IGNORETHIS") -- This will be ignored and is to work around a bug in Lovr 0.14.
45
local appId = lovr.filesystem.getIdentity()
56
if not appId then error("Failed to get the Android application ID of the loader app") end

0 commit comments

Comments
 (0)