Changeset 623 in dev for trunk/ab5.0/abdev/ab_common

Timestamp:

May 21, 2008, 11:02:07 PM (17 years ago)

Author:

dai_9181

Message:

Projectクラスをリファクタリング

Location:

trunk/ab5.0/abdev/ab_common/src

Files:

• Lexical/Source.cpp (modified) (2 diffs)
• ResourceManager/ResourceManager.cpp (modified) (3 diffs)

trunk/ab5.0/abdev/ab_common/src/Lexical/Source.cpp

@@ -537 +537 @@
 void BasicSource::DirectiveIncludeOrRequire( const std::string &mainSourceFilePath, const std::string &includeDirPath ){
     extern HANDLE hHeap;
-    extern char BasicCurDir[MAX_PATH];
     int i,i2,i3,sw1,LineNum,FileLayer[255],layer,LastFileByte[255];
     char temporary[MAX_PATH],temp2[MAX_PATH+255],*LayerDir[255];
@@ -555 +554 @@
 
     //参照ディレクトリ
-    LayerDir[0]=(char *)malloc(lstrlen(BasicCurDir)+1);
-    lstrcpy(LayerDir[0],BasicCurDir);
+    std::string mainSourceFileDir = Jenga::Common::Path::ExtractDirPath( mainSourceFilePath );
+    LayerDir[0]=(char *)malloc(mainSourceFileDir.size()+1);
+    lstrcpy(LayerDir[0],mainSourceFileDir.c_str());
 
     for(i=0;;i++){

trunk/ab5.0/abdev/ab_common/src/ResourceManager/ResourceManager.cpp

@@ -18 +18 @@
 
 
-
-    extern char BasicCurDir[MAX_PATH];
     int i2,i3;
     char temp2[MAX_PATH];
@@ -40 +38 @@
     // 改行コードのCRLFをLFに変換
     Jenga::Common::StringReplace( buffer, "\r\n", "\n" );
+
+    std::string baseDir = Jenga::Common::Path::ExtractDirPath( resourceFilePath );
 
     i2=0;
@@ -71 +71 @@
             temp2[i3]=buffer[i2];
         }
-        lstrcpy( temp2, Jenga::Common::Directory( BasicCurDir ).GetFullPath( temp2 ).c_str() );
+        lstrcpy( temp2, Jenga::Common::Directory( baseDir ).GetFullPath( temp2 ).c_str() );
 
         ResourceItem item;