Browse Source

compile fixes

rdb 12 years ago
parent
commit
2d66cdc3ba
2 changed files with 4 additions and 0 deletions
  1. 3 0
      panda/src/rocket/config_rocket.cxx
  2. 1 0
      panda/src/rocket/rocketRegion_ext.I

+ 3 - 0
panda/src/rocket/config_rocket.cxx

@@ -21,7 +21,10 @@
 #include "pandaSystem.h"
 #include "dconfig.h"
 
+// This is defined by both Panda and Rocket.
+#define Factory RocketFactory
 #include <Rocket/Core.h>
+#undef Factory
 
 Configure(config_rocket);
 NotifyCategoryDef(rocket, "");

+ 1 - 0
panda/src/rocket/rocketRegion_ext.I

@@ -16,6 +16,7 @@
 
 #ifndef CPPPARSER
 #undef this
+#define HAVE_LONG_LONG 1
 #include <Rocket/Core/Context.h>
 #include <Rocket/Core/Python/Utilities.h>
 #endif