SourceForge.net

     1.1 --- a/CMakeLists.txt	Wed Oct 28 00:24:09 2009 +0700
     1.2 +++ b/CMakeLists.txt	Wed Oct 28 08:23:07 2009 +0700
     1.3 @@ -17,9 +17,9 @@
     1.4  INCLUDE_DIRECTORIES(${MJ_BINARY_DIR}/gen)
     1.5  ADD_CUSTOM_TARGET(
     1.6      ti_tile
     1.7 -    COMMAND ./ti.pl ${MJ_SOURCE_DIR}/res/ti/tile.ti ${GEN_DIR}
     1.8 +    COMMAND perl ${MJ_SOURCE_DIR}/tools/ti.pl ${MJ_SOURCE_DIR}/res/ti/tile.ti ${GEN_DIR} ${MJ_SOURCE_DIR}/tools
     1.9      DEPENDS ${MJ_SOURCE_DIR}/res/ti/tile.ti
    1.10 -    WORKING_DIRECTORY ${MJ_SOURCE_DIR}/tools
    1.11 +    #WORKING_DIRECTORY ${MJ_SOURCE_DIR}/tools
    1.12  )
    1.13  ADD_EXECUTABLE(mj ${MJ_SRC})
    1.14  ADD_DEPENDENCIES(mj ti_tile)

     2.1 --- a/src/lf/mj/Core.cpp	Wed Oct 28 00:24:09 2009 +0700
     2.2 +++ b/src/lf/mj/Core.cpp	Wed Oct 28 08:23:07 2009 +0700
     2.3 @@ -142,7 +142,7 @@
     2.4  }
     2.5  
     2.6  void Core::run() {
     2.7 -    bool quit;
     2.8 +    bool quit = false;
     2.9      while (!quit)
    2.10          quit = !CLFRender::getInstance().update();
    2.11  }

     3.1 --- a/src/main.cpp	Wed Oct 28 00:24:09 2009 +0700
     3.2 +++ b/src/main.cpp	Wed Oct 28 08:23:07 2009 +0700
     3.3 @@ -45,8 +45,8 @@
     3.4          core->run();
     3.5      }
     3.6      else
     3.7 -        CLFLog::getInstance().log(log::ELS_USER1,
     3.8 -                                  log::ELL_ERROR,
     3.9 +        CLFLog::getInstance().log(lf::log::ELS_USER1,
    3.10 +                                  lf::log::ELL_ERROR,
    3.11                                    "Could not open layout");
    3.12      // Clean up.
    3.13      tmpl->drop();

     4.1 --- a/tools/ti.pl	Wed Oct 28 00:24:09 2009 +0700
     4.2 +++ b/tools/ti.pl	Wed Oct 28 08:23:07 2009 +0700
     4.3 @@ -7,6 +7,7 @@
     4.4  die "No input *.ti file provided" unless (scalar(@ARGV));
     4.5  my $filePath = $ARGV[0];
     4.6  my $destDir = "";
     4.7 +my $srcDir = "";
     4.8  my ($fileName, $fileDir) = fileparse($filePath);
     4.9  if ($ARGV[1]) {
    4.10      $destDir = $ARGV[1];
    4.11 @@ -17,6 +18,12 @@
    4.12  else {
    4.13      $destDir = $fileDir;
    4.14  }
    4.15 +if ($ARGV[2]) {
    4.16 +    $srcDir = $ARGV[2];
    4.17 +    if (substr($srcDir, -1, 1) ne "/") {
    4.18 +        $srcDir .= "/";
    4.19 +    }
    4.20 +}
    4.21  my $file;
    4.22  open($file, $filePath);
    4.23  my @lines = <$file>;
    4.24 @@ -131,7 +138,11 @@
    4.25  \}};
    4.26  $instCopyCtorDecl .= ";";
    4.27  #============================= Generate =============================
    4.28 -open($file, "TI.h");
    4.29 +my $inputFile = "TI.h";
    4.30 +if ($srcDir) {
    4.31 +    $inputFile = $srcDir . $inputFile;
    4.32 +}
    4.33 +open($file, $inputFile);
    4.34  my $str = join("", <$file>);
    4.35  close($file);
    4.36  $str =~ s/\$\{CLASS_NAME\}/$className/g;