Changeset 5752 for code/trunk/src/external

Timestamp:

Sep 20, 2009, 2:58:51 PM (15 years ago)

Author:

rgrieder

Message:

Small changes for the include directories:

• Our own directories get specified in src/libraries, src/orxonox and src/modules. This way you cannot include for example "CameraManager.h" in the core library.
• All tolua bind header files now go to src/toluabind to avoid declaring every folder with such header files in src separately (for each module/library).

File:

• code/trunk/src/external/tolua/lua/package.lua (modified) (3 diffs)

code/trunk/src/external/tolua/lua/package.lua

@@ -127 +127 @@
 
     if flags.H then
-        local header = gsub(flags.H, '^.-([%w_]*%.[%w_]*)$', '%1')
-        local package_lower = string.lower(self.name)
-        output('#include "'..header..'"\n')
+        output('#include "'..flags.H..'"\n')
     end
 
@@ -204 +202 @@
 
     if flags.H then
-        local package_lower = string.lower(self.name)
-        output('#include "'..package_lower..'/'..self.name..'Prereqs.h"\n')
+        output('#include "'..flags.w..'/'..self.name..'Prereqs.h"\n')
         output('/* Exported function */')
         output('_'..self.name..'Export')
@@ -222 +219 @@
 -- *** Thanks to Ariel Manzur for fixing bugs in nested directives ***
 function extract_code(fn,s)
-    local code = '\n$#include "'..string.lower(flags.n)..'/'..fn..'"\n'
+    local code = '\n$#include "'..flags.w..'/'..fn..'"\n'
     s= "\n" .. s .. "\n" -- add blank lines as sentinels