From 0b34952a93739435f16e52e583902e49bc7ebf40 Mon Sep 17 00:00:00 2001
From: oakes <zsoakes@gmail.com>
Date: Sun, 29 Dec 2013 21:39:09 -0500
Subject: [PATCH] Make Android/iOS versions work

---
 android/src/play_clj/android.clj                 | 1 -
 android/src/play_clj/native.clj                  | 6 ++++++
 common/src/play_clj/core.clj                     | 6 +-----
 desktop/src/play_clj/{desktop.clj => native.clj} | 4 ++--
 ios/src/play_clj/ios.clj                         | 1 -
 ios/src/play_clj/native.clj                      | 6 ++++++
 6 files changed, 15 insertions(+), 9 deletions(-)
 delete mode 100644 android/src/play_clj/android.clj
 create mode 100644 android/src/play_clj/native.clj
 rename desktop/src/play_clj/{desktop.clj => native.clj} (88%)
 delete mode 100644 ios/src/play_clj/ios.clj
 create mode 100644 ios/src/play_clj/native.clj

diff --git a/android/src/play_clj/android.clj b/android/src/play_clj/android.clj
deleted file mode 100644
index d29c76a..0000000
--- a/android/src/play_clj/android.clj
+++ /dev/null
@@ -1 +0,0 @@
-(ns play-clj.android)
diff --git a/android/src/play_clj/native.clj b/android/src/play_clj/native.clj
new file mode 100644
index 0000000..b546a92
--- /dev/null
+++ b/android/src/play_clj/native.clj
@@ -0,0 +1,6 @@
+(ns play-clj.native
+  (:require [play-clj.core :refer :all]))
+
+(defmacro defgame
+  [name & {:keys [] :as options}]
+  `(def ~name (create-game ~options)))
diff --git a/common/src/play_clj/core.clj b/common/src/play_clj/core.clj
index f765743..04f17a9 100644
--- a/common/src/play_clj/core.clj
+++ b/common/src/play_clj/core.clj
@@ -90,11 +90,7 @@
   [^Game game ^Screen screen]
   (.setScreen game screen))
 
-(defn defgameobj*
+(defn create-game
   [{:keys [start-screen]}]
   (proxy [Game] []
     (create [] (when start-screen (set-screen! this start-screen)))))
-
-(defmacro defgameobj
-  [name options]
-  `(def ~name (defgameobj* ~options)))
diff --git a/desktop/src/play_clj/desktop.clj b/desktop/src/play_clj/native.clj
similarity index 88%
rename from desktop/src/play_clj/desktop.clj
rename to desktop/src/play_clj/native.clj
index 55141fb..70aece3 100644
--- a/desktop/src/play_clj/desktop.clj
+++ b/desktop/src/play_clj/native.clj
@@ -1,4 +1,4 @@
-(ns play-clj.desktop
+(ns play-clj.native
   (:require [play-clj.core :refer :all])
   (:import [com.badlogic.gdx.backends.lwjgl LwjglApplication]
            [org.lwjgl.input Keyboard]))
@@ -10,7 +10,7 @@
         width (or width 800)
         height (or height 600)]
     `(do
-       (defgameobj ~name ~options)
+       (def ~name (create-game ~options))
        (defn ~'-main
          []
          (LwjglApplication. ~name ~title ~width ~height true)
diff --git a/ios/src/play_clj/ios.clj b/ios/src/play_clj/ios.clj
deleted file mode 100644
index 74bac84..0000000
--- a/ios/src/play_clj/ios.clj
+++ /dev/null
@@ -1 +0,0 @@
-(ns play-clj.ios)
diff --git a/ios/src/play_clj/native.clj b/ios/src/play_clj/native.clj
new file mode 100644
index 0000000..b546a92
--- /dev/null
+++ b/ios/src/play_clj/native.clj
@@ -0,0 +1,6 @@
+(ns play-clj.native
+  (:require [play-clj.core :refer :all]))
+
+(defmacro defgame
+  [name & {:keys [] :as options}]
+  `(def ~name (create-game ~options)))