diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-06-20 12:40:18 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-06-20 12:40:18 (GMT) |
| commit | 2be9c925088c16beb144dd9932202416d00ff581 (patch) | |
| tree | 51f8ccbf2b0b051890c5f5d12fa28a67635c06c2 /src/powdertoyjava/PowderToyJava.cpp | |
| parent | 9769239af69695e9a7f8cf103a197695ecf691e0 (diff) | |
| download | powder-2be9c925088c16beb144dd9932202416d00ff581.zip powder-2be9c925088c16beb144dd9932202416d00ff581.tar.gz | |
OpenGL canvas for Windows, Notifications for main Game, Update checker in Client (+ other client triggered events)
Diffstat (limited to 'src/powdertoyjava/PowderToyJava.cpp')
| -rw-r--r-- | src/powdertoyjava/PowderToyJava.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/powdertoyjava/PowderToyJava.cpp b/src/powdertoyjava/PowderToyJava.cpp index 969d9b2..bcc9344 100644 --- a/src/powdertoyjava/PowderToyJava.cpp +++ b/src/powdertoyjava/PowderToyJava.cpp @@ -1,4 +1,4 @@ -#if defined(USE_JNI) && defined(MACOSX) +#if defined(USE_JNI) #include <time.h> #include <iostream> @@ -8,9 +8,6 @@ #include "Config.h" #include "PowderToyJava.h" #include "Graphics.h" -#if defined(LIN32) || defined(LIN64) -#include "icon.h" -#endif #include "game/GameController.h" @@ -24,8 +21,6 @@ float fps = 0, delta = 1.0f; JNIEXPORT void JNICALL Java_PowderToy_initialise(JNIEnv * env, jobject canvas) { - //InitWindowMac(env, canvas); - ui::Engine::Ref().g = new Graphics(); engine = &ui::Engine::Ref(); |