This commit is contained in:
Bryce Covert
2017-05-17 19:25:19 -07:00
parent 8695a8e408
commit 84144efef9
98 changed files with 13 additions and 5 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -415,12 +415,15 @@
(music! snd :stop)) (music! snd :stop))
(defn make-music [r] (defn make-music [r]
(log/info "making music from" r)
(try (try
(if mobile? (if mobile?
(doto (music (str r ".mp3")) (music! :set-looping true)) (doto (music (str r ".mp3")) (music! :set-looping true))
(doto (music r) (music! :set-looping true))) (doto (music r) (music! :set-looping true)))
(catch Exception _ (catch Exception x
(log/warn "music making error" x)
(doto (music (str r ".mp3")) (music! :set-looping true))))) (doto (music (str r ".mp3")) (music! :set-looping true)))))
(defn load-sound [f] (defn load-sound [f]

View File

@@ -1,5 +1,7 @@
(ns advent.version (ns advent.version
(:gen-class)) (:gen-class))
(def version-override nil)
(defn version [] (defn version []
(-> (eval 'advent.version) .getPackage .getImplementationVersion)) (or version-override (-> (eval 'advent.version) .getPackage .getImplementationVersion)))

View File

@@ -17,11 +17,11 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>2.0.5</string> <string>2.0.6</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>116</string> <string>119</string>
<key>MinimumOSVersion</key> <key>MinimumOSVersion</key>
<string>8.0</string> <string>8.0</string>
<key>LSRequiresIPhoneOS</key> <key>LSRequiresIPhoneOS</key>

View File

@@ -14,7 +14,7 @@
:java-source-paths ["src/java"] :java-source-paths ["src/java"]
:plugins [[lein-fruit "0.2.4-SNAPSHOT"]] :plugins [[lein-fruit "0.2.4-SNAPSHOT"]]
:javac-options ["-target" "1.7" "-source" "1.7" "-Xlint:-options"] :javac-options ["-target" "1.7" "-source" "1.7" "-Xlint:-options"]
:jvm-opts [] :jvm-opts ["-Dno-steam=true"]
:ios {:robovm-opts ["-config" "robovm.xml"] :ios {:robovm-opts ["-config" "robovm.xml"]
:robovm-path "/Users/brycecovert/.robovm-sdks/robovm-2.2.1-SNAPSHOT" :robovm-path "/Users/brycecovert/.robovm-sdks/robovm-2.2.1-SNAPSHOT"
:version 2.1} :version 2.1}

View File

@@ -22,6 +22,9 @@ public class IOSLauncher extends IOSApplication.Delegate {
RT.var("clojure.core", "require").invoke(Symbol.intern("advent.core")); RT.var("clojure.core", "require").invoke(Symbol.intern("advent.core"));
try { try {
NSDictionary infoDictionary = NSBundle.getMainBundle().getInfoDictionary();
String version = infoDictionary.get(new NSString("CFBundleShortVersionString")).toString();
RT.var("advent.version", "version-override").bindRoot(version);
Game game = (Game) RT.var("advent.core", "advent").deref(); Game game = (Game) RT.var("advent.core", "advent").deref();
return new IOSApplication(game, config); return new IOSApplication(game, config);
} catch (Exception e) { } catch (Exception e) {