From cca24fe581acb601c0b347afe13938a716e30d35 Mon Sep 17 00:00:00 2001
From: bjorn <mail@bjornbyt.es>
Date: Sun, 18 Jul 2021 23:58:25 -0700
Subject: [PATCH] Tweak gitignore;

- Machine-specific excludes do not belong in lovr's gitignore.
  They should be configured using .git/info/exclude or globally.
- Preferential excludes should use .git/info/exclude (e.g.
  plugins, in-tree lua files).
- This restricts gitignore to build-system-generated artifacts.
  Honestly I'd like to remove these too, but need to monitor.
---
 .gitignore  | 8 --------
 Tupfile.lua | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0a58136c..0b5921dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,5 @@
-.DS_Store
-.vs
 .tup
 .obj
 bin
 build*
-plugins
 *.*.h
-*.lua
-*.config
-Activity*.java
-AndroidManifest*.xml
-deps/OpenXR-Oculus
diff --git a/Tupfile.lua b/Tupfile.lua
index 9546d5db..f579d444 100644
--- a/Tupfile.lua
+++ b/Tupfile.lua
@@ -452,7 +452,7 @@ if target == 'android' then
     config.headsets.pico and 'src/resources/Activity_pico.java' or
     config.headsets.openxr and 'src/resources/Activity_openxr.java'
 
-  java = 'src/resources/Activity.java'
+  java = 'bin/Activity.java'
   class = 'org/lovr/app/Activity.class'
   binclass = 'bin/' .. class
   jar = 'bin/lovr.jar'