Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2234


Ignore:
Timestamp:
Nov 19, 2008, 9:18:42 PM (15 years ago)
Author:
rgrieder
Message:

Modified package.lua to automatically remove all _LibExport macros to avoid class name conflicts.
Also adjusted hacky code in CommandExecutor, Script and GUIManager.

Location:
code/branches/buildsystem/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/buildsystem/src/core/CommandExecutor.h

    r1771 r2234  
    3636#include "CommandEvaluation.h"
    3737
    38 namespace orxonox // tolua_export
    39 { // tolua_export
     38// tolua_begin
     39namespace orxonox
     40{
    4041    class _CoreExport CommandExecutor
    41     /*
    42     class CommandExecutor { // tolua_export
    43     */
    4442    {
     43// tolua_end
    4544        public:
    4645            static bool execute(const std::string& command, bool useTcl = true); // tolua_export
  • code/branches/buildsystem/src/core/Script.h

    r1975 r2234  
    4545#include <string>
    4646
    47 namespace orxonox // tolua_export
    48 { // tolua_export
     47// tolua_begin
     48namespace orxonox
     49{
    4950  class _CoreExport Script
    50   /*
    51   class Script { // tolua_export
    52   */
    5351  {
     52// tolua_end
    5453    struct LoadS {
    5554      const char *s;
  • code/branches/buildsystem/src/orxonox/gui/GUIManager.h

    r1755 r2234  
    4242#include "core/input/InputInterfaces.h"
    4343
    44 namespace orxonox // tolua_export
    45 { // tolua_export
     44// tolua_begin
     45namespace orxonox
     46{
    4647    /**
    4748    @brief
    4849        Provides a simple interface to CEGUI with tolua methods and console commands
    4950    */
    50     class _OrxonoxExport GUIManager : public KeyHandler, public MouseHandler
    51     /*
    52     class GUIManager { // tolua_export
    53     */
    54     {
     51    class _OrxonoxExport GUIManager
     52// tolua_end
     53                : public KeyHandler, public MouseHandler
     54    { // tolua_export
    5555    public:
    5656        enum State
  • code/branches/buildsystem/src/tolua/lua/package.lua

    r2233 r2234  
    239239    local code = '\n$#include "'..fn..'"\n'
    240240    s= "\n" .. s .. "\n" -- add blank lines as sentinels
     241
     242    -- eliminate export macro problems in class declarations
     243    s = gsub(s, ' _%w*Export ', ' ')
     244
    241245    local _,e,c,t = strfind(s, "\n([^\n]-)[Tt][Oo][Ll][Uu][Aa]_([^%s]*)[^\n]*\n")
    242246    while e do
Note: See TracChangeset for help on using the changeset viewer.