Skip to content

Commit

Permalink
0.15 compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
mcclure committed Apr 19, 2021
1 parent 27a87ba commit d3ba686
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions main.lua
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ tryMount()
local recursiveWatch = recursiveWatchMaker(watched, mainRealpath)

if hasMain then
if lovr.getOS() == "Android" then
if lovr.system.getOS() == "Android" then
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)
end

Expand Down Expand Up @@ -143,7 +143,7 @@ else
else
message = message .. "does not contain a main.lua."
end
if lovr.getOS() == "Android" then
if lovr.system.getOS() == "Android" then
message = message .. "\n\nTo upload a " .. ((not hasProject or not atLeastOneFile) and "" or "fixed ")
.. "project,\ncd to your project directory and run:\n"
.. "adb push --sync . " .. target
Expand Down
3 changes: 2 additions & 1 deletion z_lodrSupport/target.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
-- lodr helper figures out what directory it is we're supposed to be running
if lovr.getOS() == "Android" then
local system = lovr.system or require('lovr.system')
if system.getOS() == "Android" then
lovr.filesystem.setIdentity("IGNORETHIS") -- This will be ignored and is to work around a bug in Lovr 0.14.
local appId = lovr.filesystem.getIdentity()
if not appId then error("Failed to get the Android application ID of the loader app") end
Expand Down

0 comments on commit d3ba686

Please sign in to comment.