Changeset 167 in dev for trunk/abdev/BasicCompiler_Common/BasicCompiler.cpp

Timestamp:

Jun 17, 2007, 9:56:19 PM (17 years ago)

Author:

dai_9181

Message:

BasicSysDirをGetAppDirに置き換えた

File:

• trunk/abdev/BasicCompiler_Common/BasicCompiler.cpp (modified) (6 diffs)

trunk/abdev/BasicCompiler_Common/BasicCompiler.cpp

@@ -1 @@
-#include <jenga/include/common/logger.h>
-#include <jenga/include/common/Environment.h>
+#include <Program.h>
 
 #include "BasicCompiler.h"
@@ -163 +162 @@
     lstrcpy(path,temp3);
 }
-void GetFullPath(char *path,char *dir){
+void GetFullPath( char *path, const string &baseDirPath ){
     int i,i2,i3,i4;
     char temporary[MAX_PATH];
@@ -186 +185 @@
     }
 
-    i3=lstrlen(dir);i4=0;
+    i3=baseDirPath.size();i4=0;
     while(i4<i2){
         for(i3--;;i3--){
-            if(dir[i3-1]=='\\'){
+            if(baseDirPath[i3-1]=='\\'){
                 i4++;
                 break;
@@ -195 +194 @@
         }
     }
-    memcpy(temporary,dir,i3);
+    memcpy(temporary,baseDirPath.c_str(),i3);
     temporary[i3]=0;
     lstrcat(temporary,path+i);
@@ -563 +562 @@
     hInst=hThisInst;
 
-    GetModuleFileName(hInst,temporary,MAX_PATH);
-    _splitpath(temporary,BasicSystemDir,temp2,NULL,NULL);
-    lstrcat(BasicSystemDir,temp2);
-
     //不揮発性データを取得
     pobj_nv=new CNonVolatile;
@@ -742 +737 @@
 
     //インクルードディレクトリを絶対パスに変更
-    GetFullPath(szIncludeDir,BasicSystemDir);
+    GetFullPath(szIncludeDir,(Jenga::Common::Environment::GetAppDir()+"\\").c_str());
 
     if(bDll){