Changeset 11278 for code/branches/mac_HS16/src

Timestamp:

Nov 8, 2016, 9:05:10 AM (8 years ago)

Author:

ahedges

Message:

comment out some stuff and update the cmake file for macOS 10.12

Location:

code/branches/mac_HS16/src

Files:

• external/tolua/CMakeLists.txt (modified) (1 diff)
• external/tolua/tolua++.h (deleted)
• orxonox/worldentities/Actionpoint.cc (modified) (1 diff)

code/branches/mac_HS16/src/external/tolua/CMakeLists.txt

@@ -35 +35 @@
 SET(TOLUA_PARSER_DEPENDENCIES
   toluaapp_orxonox
-  ${CMAKE_CURRENT_SOURCE_DIR}/tolua++.h
   ${CMAKE_CURRENT_SOURCE_DIR}/all-5.1.lua
   ${CMAKE_CURRENT_SOURCE_DIR}/lua/compat-5.1.lua

code/branches/mac_HS16/src/orxonox/worldentities/Actionpoint.cc

@@ -31 +31 @@
 namespace orxonox
 {
-    RegisterClass(Actionpoint);
+//    RegisterClass(Actionpoint); ?
 
     Actionpoint::Actionpoint(Context* context) : StaticEntity(context)
     {
-        RegisterObject(Actionpoint);
+//        RegisterObject(Actionpoint);
         
         this->actionName_ = "";