Merge pull request #2 from CleverRaven/master

Catching up to current version

.editorconfig

@@ -7,6 +7,11 @@ root = true
 [*]
 end_of_line = lf
 insert_final_newline = true
-# 4 space indentation
 indent_style = space
 indent_size = 4
+
+[*.json]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2

.github/stale.yml

@@ -54,7 +54,7 @@ closeComment: >
   re-opened if you are going to actively work on it
 
 # Limit the number of actions per hour, from 1-30. Default is 30
-limitPerRun: 1
+limitPerRun: 2
 
 # Limit to only `issues` or `pulls`
 # only: issues

.github/workflows/json.yml

@@ -1,9 +1,7 @@
 name: JSON Validation
 
 on:
-  push:
-    paths:
-    - "*.json"
+  pull_request
 
 jobs:
   style-json:
@@ -17,3 +15,6 @@ jobs:
         fetch-depth: 10
     - name: JSON style check
       run: make style-json
+    - name: Display Corrections
+      if: failure()
+      run: git diff

.gitignore

@@ -104,6 +104,7 @@ nbproject/
 *.vim
 *.session
 .ycm_extra_conf.py
+.vimrc
 
 # taskwarrior files
 *.task*

.travis.yml

@@ -45,6 +45,7 @@ branches:
 # - SANITIZE=address
 # - LOCALIZE=0
 # - A clang-tidy run
+# - Tests with important mods enabled (Magiclysm, RL_Classes)
 # We try to minimize the number of builds subject to those constraints.
 
 # To see what toolchains are available, consult the following:
@@ -66,8 +67,8 @@ jobs:
 
     # Then build different configurations and targets in parallel.
     - stage: "Main Compilers"
-      env: COMPILER=g++ LOCALIZE=0
-      name: "GCC 5.3 Make build with curses and no Localization"
+      env: COMPILER=g++ MODS=--mods=magiclysm LOCALIZE=0
+      name: "GCC 5.3 Make build with curses, Magiclysm, and no Localization"
       compiler: gcc
       addons: &gcc53
         apt:

Makefile

@@ -993,7 +993,7 @@ ifdef LANGUAGES
 endif
 	$(BINDIST_CMD)
 
-export ODIR _OBJS LDFLAGS CXX W32FLAGS DEFINES CXXFLAGS
+export ODIR _OBJS LDFLAGS CXX W32FLAGS DEFINES CXXFLAGS TARGETSYSTEM
 
 ctags: $(SOURCES) $(HEADERS) $(TESTSRC) $(TESTHDR)
 	ctags $(SOURCES) $(HEADERS) $(TESTSRC) $(TESTHDR)

android/app/build.gradle

@@ -22,6 +22,19 @@ if (localPropertiesFile.exists()) {
     }
 }
 
+def keystorePropertiesFilename = 'keystore.properties'
+if( localProperties.getProperty('keystorePropertiesFilename') != null ) {
+    keystorePropertiesFilename = localProperties.getProperty("keystorePropertiesFilename")
+}
+
+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file(keystorePropertiesFilename)
+if (keystorePropertiesFile.exists()) {
+    keystorePropertiesFile.withReader('UTF-8') { reader ->
+        keystoreProperties.load(reader)
+    }
+}
+
 def njobs = getProperty("j")
 
 task unzipDeps(type: Copy) {
@@ -101,16 +114,16 @@ android {
     testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     signingConfigs {
-        if( localProperties.getProperty('storeFile') != null ) {
-            if( file(localProperties.getProperty('storeFile')).exists() ) {
+        if( keystoreProperties.getProperty('storeFile') != null ) {
+            if( file(keystoreProperties.getProperty('storeFile')).exists() ) {
                 release {
-                    storeFile file(localProperties.getProperty("storeFile"))
-                    storePassword localProperties.getProperty("storePassword")
-                    keyAlias localProperties.getProperty("keyAlias")
-                    keyPassword localProperties.getProperty("keyPassword")
+                    storeFile file(keystoreProperties.getProperty("storeFile"))
+                    storePassword keystoreProperties.getProperty("storePassword")
+                    keyAlias keystoreProperties.getProperty("keyAlias")
+                    keyPassword keystoreProperties.getProperty("keyPassword")
                 }
             } else {
-                throw new GradleException("Keystore file " + localProperties.getProperty("storeFile") + " was not found.\n")
+                throw new GradleException("Keystore file " + keystoreProperties.getProperty("storeFile") + " was not found.\n")
             }
         }
     }

android/app/src/main/java/org/libsdl/app/HIDDevice.java

@@ -0,0 +1,19 @@
+package org.libsdl.app;
+
+interface HIDDevice
+{
+    public int getId();
+    public int getVendorId();
+    public int getProductId();
+    public String getSerialNumber();
+    public int getVersion();
+    public String getManufacturerName();
+    public String getProductName();
+    public boolean open();
+    public int sendFeatureReport(byte[] report);
+    public int sendOutputReport(byte[] report);
+    public boolean getFeatureReport(byte[] report);
+    public void setFrozen(boolean frozen);
+    public void close();
+    public void shutdown();
+}