Merge branch 'master' of https://github.com/WagicProject/wagic into wp8

Fixe timer in Qt frontend
Fixe ExtraCost compilation (uses boost when not on WP8).
This commit is contained in:
xawotihs
2013-11-17 18:33:52 +01:00
20 changed files with 410 additions and 271 deletions
+4
View File
@@ -67,6 +67,9 @@ public:
void registerDefaultBindings();
static WagicCore* getInstance() { return s_instance; };
char *GetName(){ return m_launcher->GetName();};
#ifdef QT_CONFIG
QTime startTime;
#endif
private:
void doAndEnqueue(JButton action) {
@@ -75,6 +78,7 @@ private:
}
private:
friend int JGEGetTime();
static WagicCore* s_instance;
JGE* m_engine;
JApp* m_app;