Changeset 958Tweet

Timestamp:

Sep 18, 2011, 11:01:26 PM (11 years ago)

Author:

sam

Message:

osx: automake does not support .mm files yet, so rename ios-image.mm back
to ios-image.cpp, but disable it on OS X because UIKit isn't available.

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• deushax/deushax.cpp (modified) (1 diff)
• monsterz/monsterz.cpp (modified) (1 diff)
• monsterz/piece.cpp (modified) (6 diffs)
• monsterz/title.cpp (modified) (3 diffs)
• src/Makefile.am (modified) (1 diff)
• src/dict.cpp (modified) (5 diffs)
• src/dict.h (modified) (1 diff)
• src/image/codec/ios-image.cpp (moved) (moved from trunk/src/image/codec/ios-image.mm) (2 diffs)
• src/image/image.cpp (modified) (1 diff)
• test/benchsuite.cpp (modified) (1 diff)
• test/debug/quad.cpp (modified) (1 diff)
• test/debug/sandbox.cpp (modified) (1 diff)
• test/testsuite.cpp (modified) (1 diff)

trunk/configure.ac

@@ -233 +233 @@
 
 
+dnl Use Cocoa?
+ac_cv_my_have_cocoa="no"
+LIBS_save="$LIBS"
+LIBS="$LIBS -Wl,-framework -Wl,Cocoa"
+AC_MSG_CHECKING(for -framework Cocoa)
+AC_TRY_LINK([], [],
+ [ac_cv_my_have_cocoa="yes"
+  AC_MSG_RESULT(yes)
+  CXXFLAGS="${CXXFLAGS} -ObjC++"],
+ [AC_MSG_RESULT(no)])
+LIBS="$LIBS_save"
+AM_CONDITIONAL(USE_COCOA, test "${ac_cv_my_have_cocoa}" != "no")
+
+
 dnl Use EGL?
 ac_cv_my_have_egl="no"

trunk/deushax/deushax.cpp

@@ -21 +21 @@
 #include "platform/sdl/sdlinput.h"
 #include "debugsprite.h"
+
+#if USE_SDL
+#   include <SDL_main.h>
+#endif
 
 #if defined _WIN32

trunk/monsterz/monsterz.cpp

@@ -35 +35 @@
 #include "interface.h"
 
+#if USE_SDL
+#   include <SDL_main.h>
+#endif
+
 #if defined _WIN32
 #   undef main /* FIXME: still needed? */

trunk/monsterz/piece.cpp

@@ -39 +39 @@
     Piece *above, *below;
     ivec2 size, cell, pos, pos_src, pos_dst, off, off_src;
-    int id;
+    int pieceid;
     float speed, timer;
 
@@ -74 +74 @@
  */
 
-Piece::Piece(piece_t piece, Emitter *emitter, ivec2 cell, int id)
+Piece::Piece(piece_t piece, Emitter *emitter, ivec2 cell, int pieceid)
   : data(new PieceData())
 {
@@ -95 +95 @@
         data->size = 48;
         data->tileset = Tiler::Register(PNG_TILES, data->size, 0, 1.0f);
-        data->id = 80 + 20 * id;
+        data->pieceid = 80 + 20 * pieceid;
         break;
     }
@@ -309 +309 @@
         {
             vec3 pos(data->pos.x + 24, data->pos.y + 72, 5);
-            int start = data->id + 12;
-            int stop = data->id + 15;
-            for (int id = start; id < stop; id++)
+            int start = data->pieceid + 12;
+            int stop = data->pieceid + 15;
+            for (int pieceid = start; pieceid < stop; pieceid++)
             {
                 float angle = RandF(-1.2f, 1.2f);
                 float speed = RandF(0.3f, 0.5f);
                 vec3 vel(speed * sinf(angle), speed * cosf(angle), 0.0f);
-                data->emitter->AddParticle(id, pos, vel);
+                data->emitter->AddParticle(pieceid, pos, vel);
             }
 
@@ -333 +333 @@
     Entity::TickDraw(deltams);
 
-    int id = data->id, off = 0;
+    int pieceid = data->pieceid, off = 0;
     int x = data->pos.x + data->off.x + 24;
     int y = data->pos.y + data->off.y + 72;
@@ -378 +378 @@
     {
     case PIECE_HUNT:
-        id += off;
+        pieceid += off;
         break;
     }
 
     if (data->state != PieceData::DEAD)
-        Scene::GetDefault()->AddTile(data->tileset, id, ivec3(x, y, z), 0);
+        Scene::GetDefault()->AddTile(data->tileset, pieceid, ivec3(x, y, z), 0);
 
     if (data->state == PieceData::GRAB && Platform::GetMouseCount())

trunk/monsterz/title.cpp

@@ -353 +353 @@
     /* Maybe an animation? */
     TileSet *tiler = NULL;
-    int id = 0;
+    int tileid = 0;
     ivec2 pos = 0;
 
@@ -364 +364 @@
         pos = animpos[data->animid];
         pos.y = 384 - animsize[data->animid].y - pos.y; // Hack
-        id = (data->length - data->timer) * data->nframes / data->length;
-        if (id < 0) id = 0;
-        if (id > data->nframes - 1) id = data->nframes - 1;
+        tileid = (data->length - data->timer) * data->nframes / data->length;
+        if (tileid < 0) tileid = 0;
+        if (tileid > data->nframes - 1) tileid = data->nframes - 1;
         break;
     case TitleData::EVENT:
@@ -372 +372 @@
         pos = eventpos[data->animid];
         pos.y = 384 - eventsize[data->animid].y - pos.y; // Hack
-        id = (data->length - data->timer) * data->nframes / data->length;
-        if (id < 0) id = 0;
-        if (id > data->nframes - 1) id = data->nframes - 1;
+        tileid = (data->length - data->timer) * data->nframes / data->length;
+        if (tileid < 0) tileid = 0;
+        if (tileid > data->nframes - 1) tileid = data->nframes - 1;
         break;
     }
     if (tiler)
-        Scene::GetDefault()->AddTile(tiler, id,
+        Scene::GetDefault()->AddTile(tiler, tileid,
                                      ivec3(data->ground_pos.x + pos.x,
                                            data->ground_pos.y + pos.y, 1), 0);

trunk/src/Makefile.am

@@ -27 +27 @@
     image/image.cpp image/image.h image/image-private.h \
     image/codec/android-image.cpp \
-    image/codec/ios-image.mm \
+    image/codec/ios-image.cpp \
     image/codec/sdl-image.cpp \
     image/codec/ps3-image.cpp \

trunk/src/dict.cpp

@@ -74 +74 @@
 int Dict::MakeSlot(char const *name)
 {
-    int id, empty = -1;
+    int slotid, empty = -1;
 
     /* If the entry is already registered, remember its ID. Look for an
      * empty slot at the same time. */
-    for (id = 0; id < data->maxid; id++)
+    for (slotid = 0; slotid < data->maxid; slotid++)
     {
-        Entity *e = data->entities[id];
+        Entity *e = data->entities[slotid];
         if (!e)
         {
-            empty = id;
+            empty = slotid;
             break;
         }
@@ -105 +105 @@
 
     /* If this is a new entry, create a new slot for it. */
-    if (id == data->maxid || !data->entities[id])
+    if (slotid == data->maxid || !data->entities[slotid])
     {
-        if (id == data->maxid)
+        if (slotid == data->maxid)
         {
             empty = data->maxid++;
@@ -115 +115 @@
 
         data->entities[empty] = NULL;
-        id = empty;
+        slotid = empty;
         data->nentities++;
     }
     else
     {
-        Ticker::Ref(data->entities[id]);
+        Ticker::Ref(data->entities[slotid]);
     }
 
-    return id;
+    return slotid;
 }
 
-void Dict::RemoveSlot(int id)
+void Dict::RemoveSlot(int slotid)
 {
-    if (Ticker::Unref(data->entities[id]) == 0)
+    if (Ticker::Unref(data->entities[slotid]) == 0)
     {
-        data->entities[id] = NULL;
+        data->entities[slotid] = NULL;
         data->nentities--;
     }
@@ -137 +137 @@
 void Dict::RemoveSlot(Entity *entity)
 {
-    for (int id = 0; id < data->maxid; id++)
-        if (data->entities[id] == entity)
+    for (int slotid = 0; slotid < data->maxid; slotid++)
+        if (data->entities[slotid] == entity)
         {
-            RemoveSlot(id);
+            RemoveSlot(slotid);
             return;
         }
@@ -149 +149 @@
 }
 
-void Dict::SetEntity(int id, Entity *entity)
+void Dict::SetEntity(int slotid, Entity *entity)
 {
     Ticker::Ref(entity);
-    data->entities[id] = entity;
+    data->entities[slotid] = entity;
 }
 
-Entity *Dict::GetEntity(int id)
+Entity *Dict::GetEntity(int slotid)
 {
-    return data->entities[id];
+    return data->entities[slotid];
 }
 

trunk/src/dict.h

@@ -31 +31 @@
 
     int MakeSlot(char const *name);
-    void RemoveSlot(int id);
+    void RemoveSlot(int slotid);
     void RemoveSlot(Entity *entity);
 
-    void SetEntity(int id, Entity *entity);
-    Entity *GetEntity(int id);
+    void SetEntity(int slotid, Entity *entity);
+    Entity *GetEntity(int slotid);
 
 private:

trunk/src/image/codec/ios-image.cpp

@@ -13 +13 @@
 #endif
 
-#if defined __APPLE__ && defined __MACH__
+#if defined __APPLE__ && defined __MACH__ && defined __arm__
 
 #include <cmath>
@@ -98 +98 @@
 } /* namespace lol */
 
-#endif /* defined __APPLE__ && defined __MACH__ */
+#endif /* defined __APPLE__ && defined __MACH__ && defined __arm__ */
 

trunk/src/image/image.cpp

@@ -29 +29 @@
 #endif
     REGISTER_IMAGE_LOADER(DummyImageData)
-#if defined __APPLE__ && defined __MACH__
+#if defined __APPLE__ && defined __MACH__ && defined __arm__
     REGISTER_IMAGE_LOADER(IosImageData)
 #endif

trunk/test/benchsuite.cpp

@@ -14 +14 @@
 
 #include <cstdio>
+
+#if USE_SDL
+#   include <SDL_main.h>
+#endif
 
 #include "core.h"

trunk/test/debug/quad.cpp

@@ -29 +29 @@
 #endif
 
+#if USE_SDL
+#   include <SDL_main.h>
+#endif
+
 #if defined _WIN32
 #   undef main /* FIXME: still needed? */

trunk/test/debug/sandbox.cpp

@@ -13 +13 @@
 #endif
 
+#if USE_SDL
+#   include <SDL_main.h>
+#endif
+
 #include "core.h"
 

trunk/test/testsuite.cpp

@@ -16 +16 @@
 #include <cstdlib>
 
+#if USE_SDL
+#   include <SDL_main.h>
+#endif
+
 #include <lol/unit.h>
 
-int main(void)
+int main(int argc, char **argv)
 {
     lol::TextTestRunner runner;