Compile fixes

2014-03-18 22:59:11 -07:00
parent 098b4328de
commit 933fec22ac
2 changed files with 5 additions and 1 deletions
--- a/project/include/renderer/opengl/OpenGLContext.h
+++ b/project/include/renderer/opengl/OpenGLContext.h
@@ -69,7 +69,7 @@ namespace lime {
 			QuickVec<GLuint> mZombieVbos;
 			
 			#ifdef ANDROID
-			OpenGLS3D *mS3D;
+			OpenGLS3D mS3D;
 			#endif
 	};
 	
--- a/project/src/backend/sdl/SDLStage.cpp
+++ b/project/src/backend/sdl/SDLStage.cpp
@@ -685,7 +685,11 @@ public:
   double mDownY;
   
   const char *getJoystickName(int id) {
+      #if !defined(BLACKBERRY) && !defined(EMSCRIPTEN)
      return SDL_JoystickNameForIndex(id);
+      #else
+      return "";
+      #endif
   }

   Surface *GetPrimarySurface()