Index: trunk/ab5.0/abdev/BasicCompiler64/BasicCompiler.vcproj
===================================================================
--- trunk/ab5.0/abdev/BasicCompiler64/BasicCompiler.vcproj (revision 479)
+++ trunk/ab5.0/abdev/BasicCompiler64/BasicCompiler.vcproj (revision 480)
@@ -240,4 +240,8 @@
RelativePathToProject="..\jenga\projects\jenga\jenga.vcproj"
/>
+
Index: trunk/ab5.0/abdev/BasicCompiler_Common/BasicCompiler.cpp
===================================================================
--- trunk/ab5.0/abdev/BasicCompiler_Common/BasicCompiler.cpp (revision 479)
+++ trunk/ab5.0/abdev/BasicCompiler_Common/BasicCompiler.cpp (revision 480)
@@ -251,5 +251,5 @@
hFile=CreateFile(
- ( Jenga::Common::Environment::GetAppDir() + "\\pgm.tmp" ).c_str(),
+ ( ActiveBasic::Common::Environment::GetAbdevRootPath() + "\\pgm.tmp" ).c_str(),
GENERIC_WRITE,0,NULL,CREATE_ALWAYS,FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_TEMPORARY,NULL);
WriteFile(hFile,FileName,lstrlen(FileName),&dw,NULL);
@@ -681,12 +681,12 @@
{
// インクルードディレクトリを絶対パスに変更
- program.SetIncludeDir( Jenga::Common::Path::MakeFullPath( program.GetIncludeDir(), ActiveBasic::Common::Environment::GetAbdevRootPath() ) );
+ program.SetIncludeDir( Jenga::Common::Path::MakeFullPathByCurrentDirectory( program.GetIncludeDir() ) );
}
// ソースファイル名を絶対パスに変換
- program.SetSourceFilePath( Jenga::Common::Path::MakeFullPath( program.GetSourceFilePath(), baseDirPath ) );
+ program.SetSourceFilePath( Jenga::Common::Path::MakeFullPathByCurrentDirectory( program.GetSourceFilePath() ) );
// 出力ファイル名を絶対パスに変換
- program.SetOutputFilePath( Jenga::Common::Path::MakeFullPath( program.GetOutputFilePath(), baseDirPath ) );
+ program.SetOutputFilePath( Jenga::Common::Path::MakeFullPathByCurrentDirectory( program.GetOutputFilePath() ) );
// モジュール名をセット
@@ -707,5 +707,5 @@
DWORD dwAccessBytes;
hFile=CreateFile(
- ( Jenga::Common::Environment::GetAppDir() + "\\pgm.tmp" ).c_str(),
+ ( ActiveBasic::Common::Environment::GetAbdevRootPath() + "\\pgm.tmp" ).c_str(),
GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
if(hFile!=INVALID_HANDLE_VALUE){
Index: trunk/ab5.0/abdev/BasicCompiler_Common/src/Messenger.cpp
===================================================================
--- trunk/ab5.0/abdev/BasicCompiler_Common/src/Messenger.cpp (revision 479)
+++ trunk/ab5.0/abdev/BasicCompiler_Common/src/Messenger.cpp (revision 480)
@@ -471,5 +471,5 @@
hFile=CreateFile(
- ( Jenga::Common::Environment::GetAppDir() + "\\pgm.tmp" ).c_str(),
+ ( ActiveBasic::Common::Environment::GetAbdevRootPath() + "\\pgm.tmp" ).c_str(),
GENERIC_WRITE,0,NULL,CREATE_ALWAYS,FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_TEMPORARY,NULL);
WriteFile(hFile,FileName,lstrlen(FileName),&dw,NULL);
Index: trunk/ab5.0/abdev/ProjectEditor/NonVolatile.cpp
===================================================================
--- trunk/ab5.0/abdev/ProjectEditor/NonVolatile.cpp (revision 479)
+++ trunk/ab5.0/abdev/ProjectEditor/NonVolatile.cpp (revision 480)
@@ -444,5 +444,5 @@
//インクルードディレクトリ
- if(!GetStringValue("IncludeDir",szIncludeDir)) lstrcpy(szIncludeDir,"..\\Include\\");
+ if(!GetStringValue("IncludeDir",szIncludeDir)) lstrcpy(szIncludeDir,".\\ablib\\src");
HeapDefaultFree(buffer);
@@ -550,5 +550,5 @@
//インクルードディレクトリ
- lstrcpy(szIncludeDir,"..\\Include\\");
+ lstrcpy(szIncludeDir,".\\ablib\\src");
//ウィンドウ位置、サイズ
Index: trunk/ab5.0/abdev/ProjectEditor/NonVolatile.h
===================================================================
--- trunk/ab5.0/abdev/ProjectEditor/NonVolatile.h (revision 479)
+++ trunk/ab5.0/abdev/ProjectEditor/NonVolatile.h (revision 480)
@@ -103,4 +103,8 @@
//インクルードディレクトリ
char szIncludeDir[MAX_PATH];
+ std::string GetIncludeDirFullPath()
+ {
+ return Jenga::Common::Path::MakeFullPath( szIncludeDir, ActiveBasic::Common::Environment::GetAbdevRootPath() );
+ }
//////////////////////////////////////////////////////////////
Index: trunk/ab5.0/abdev/ProjectEditor/ProjectEditor.cpp
===================================================================
--- trunk/ab5.0/abdev/ProjectEditor/ProjectEditor.cpp (revision 479)
+++ trunk/ab5.0/abdev/ProjectEditor/ProjectEditor.cpp (revision 480)
@@ -2079,5 +2079,5 @@
//インクルードディレクトリ
- sprintf(temp2," /include_dir:\"%s\"",pobj_nv->szIncludeDir);
+ sprintf(temp2," /include_dir:\"%s\"",pobj_nv->GetIncludeDirFullPath().c_str());
lstrcat(temporary,temp2);
@@ -2129,5 +2129,5 @@
//インクルードディレクトリ
- sprintf(temp2," /include_dir:\"%s\"",pobj_nv->szIncludeDir);
+ sprintf(temp2," /include_dir:\"%s\"",pobj_nv->GetIncludeDirFullPath().c_str());
lstrcat(temporary,temp2);
@@ -2160,5 +2160,5 @@
//インクルードディレクトリ
- sprintf(temp2," /include_dir:\"%s\"",pobj_nv->szIncludeDir);
+ sprintf(temp2," /include_dir:\"%s\"",pobj_nv->GetIncludeDirFullPath().c_str());
lstrcat(temporary,temp2);
@@ -2224,5 +2224,5 @@
//インクルードディレクトリ
- sprintf(temp2," /include_dir:\"%s\"",pobj_nv->szIncludeDir);
+ sprintf(temp2," /include_dir:\"%s\"",pobj_nv->GetIncludeDirFullPath().c_str());
lstrcat(temporary,temp2);
@@ -2263,5 +2263,5 @@
//インクルードディレクトリ
- sprintf(temp2," /include_dir:\"%s\"",pobj_nv->szIncludeDir);
+ sprintf(temp2," /include_dir:\"%s\"",pobj_nv->GetIncludeDirFullPath().c_str());
lstrcat(temporary,temp2);
Index: trunk/ab5.0/abdev/ProjectEditor/ProjectEditor.vcproj
===================================================================
--- trunk/ab5.0/abdev/ProjectEditor/ProjectEditor.vcproj (revision 479)
+++ trunk/ab5.0/abdev/ProjectEditor/ProjectEditor.vcproj (revision 480)
@@ -52,7 +52,7 @@
AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost;.\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;JPN;THETEXT;WINVER=0x0501;_WIN32_WINNT=0x0501"
- StringPooling="true"
+ StringPooling="false"
RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
+ EnableFunctionLevelLinking="false"
UsePrecompiledHeader="2"
PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
@@ -63,4 +63,5 @@
WarningLevel="3"
SuppressStartupBanner="true"
+ DebugInformationFormat="3"
/>
szIncludeDir, ".\\Include\\" );
- }
- }
if( !pHeaderBuf ){
Index: trunk/ab5.0/abdev/ab_common/ab_common.vcproj
===================================================================
--- trunk/ab5.0/abdev/ab_common/ab_common.vcproj (revision 479)
+++ trunk/ab5.0/abdev/ab_common/ab_common.vcproj (revision 480)
@@ -17,5 +17,5 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#include
#include
@@ -77,2 +78,6 @@
return resultPath;
}
+std::string Jenga::Common::Path::MakeFullPathByCurrentDirectory( const std::string &relativePath )
+{
+ return MakeFullPath( relativePath, Jenga::Common::Environment::GetCurrentDir() );
+}