- Timestamp:
- Apr 6, 2008, 8:07:40 PM (17 years ago)
- Location:
- trunk/ab5.0
- Files:
-
- 2 added
- 33 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ab5.0/abdev/BasicCompiler32/BasicCompiler.vcproj
r475 r477 61 61 WarningLevel="3" 62 62 SuppressStartupBanner="true" 63 DebugInformationFormat=" 4"63 DebugInformationFormat="3" 64 64 /> 65 65 <Tool … … 153 153 AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost;..\BasicCompiler_Common\include" 154 154 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;JPN" 155 StringPooling=" true"155 StringPooling="false" 156 156 RuntimeLibrary="0" 157 EnableFunctionLevelLinking=" true"157 EnableFunctionLevelLinking="false" 158 158 RuntimeTypeInfo="true" 159 159 UsePrecompiledHeader="2" … … 166 166 WarningLevel="3" 167 167 SuppressStartupBanner="true" 168 DebugInformationFormat="3" 168 169 /> 169 170 <Tool … … 1588 1589 > 1589 1590 <File 1591 RelativePath="..\BasicCompiler_Common\include\Configuration.h" 1592 > 1593 </File> 1594 <File 1590 1595 RelativePath="..\BasicCompiler_Common\include\Program.h" 1591 1596 > -
trunk/ab5.0/abdev/BasicCompiler32/MakePeHdr.cpp
r467 r477 1106 1106 int DosStubSize; 1107 1107 hFile=CreateFile( 1108 ( Jenga::Common::Environment::GetAppDir() + "\\SubOperation\\dosstub.pgm" ).c_str(),1108 ( ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\dosstub.pgm" ).c_str(), 1109 1109 GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL); 1110 1110 if(hFile==INVALID_HANDLE_VALUE){ -
trunk/ab5.0/abdev/BasicCompiler32/stdafx.h
r472 r477 22 22 #include <boost/foreach.hpp> 23 23 24 #include <jenga/include/common/CmdLine.h> 25 #include <jenga/include/common/Environment.h> 26 #include <jenga/include/common/File.h> 27 #include <jenga/include/common/Path.h> 24 28 #include <jenga/include/common/String.h> 25 #include <jenga/include/common/File.h> 26 #include <jenga/include/common/CmdLine.h> 27 #include <jenga/include/common/Path.h> 29 30 #include <abdev/ab_common/Environment.h> 28 31 29 32 #include "../BasicCompiler_Common/common.h" … … 31 34 32 35 #include <Hashmap.h> 36 #include <Configuration.h> 33 37 #include <Program.h> 34 38 #include <Compiler.h> -
trunk/ab5.0/abdev/BasicCompiler64/BasicCompiler.vcproj
r475 r477 442 442 > 443 443 <File 444 RelativePath="..\BasicCompiler_Common\include\Configuration.h" 445 > 446 </File> 447 <File 444 448 RelativePath="..\BasicCompiler_Common\include\Program.h" 445 449 > -
trunk/ab5.0/abdev/BasicCompiler64/MakePeHdr.cpp
r468 r477 1105 1105 int DosStubSize; 1106 1106 hFile=CreateFile( 1107 ( Jenga::Common::Environment::GetAppDir() + "\\SubOperation\\dosstub.pgm" ).c_str(),1107 ( ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\dosstub.pgm" ).c_str(), 1108 1108 GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL); 1109 1109 if(hFile==INVALID_HANDLE_VALUE){ -
trunk/ab5.0/abdev/BasicCompiler64/stdafx.h
r472 r477 22 22 #include <boost/foreach.hpp> 23 23 24 #include <jenga/include/common/CmdLine.h> 25 #include <jenga/include/common/Environment.h> 26 #include <jenga/include/common/File.h> 27 #include <jenga/include/common/Path.h> 24 28 #include <jenga/include/common/String.h> 25 #include <jenga/include/common/File.h> 26 #include <jenga/include/common/CmdLine.h> 27 #include <jenga/include/common/Path.h> 29 30 #include <abdev/ab_common/Environment.h> 28 31 29 32 #include "../BasicCompiler_Common/common.h" … … 31 34 32 35 #include <Hashmap.h> 36 #include <Configuration.h> 33 37 #include <Program.h> 34 38 #include <Compiler.h> -
trunk/ab5.0/abdev/BasicCompiler_Common/BasicCompiler.cpp
r472 r477 93 93 void ts(const char *msg,const char *title){ 94 94 MessageBox(0,FormatEscapeSequenceStringToDefaultString(msg).c_str(),title,0); 95 } 96 void ts(const std::string msg) 97 { 98 ts(msg.c_str()); 95 99 } 96 100 … … 192 196 } 193 197 194 i3=(int)baseDirPath.size();i4=0; 198 std::string tempBaseDirPath = baseDirPath; 199 if( tempBaseDirPath[tempBaseDirPath.size()-1] != '\\' ) 200 { 201 tempBaseDirPath += "\\"; 202 } 203 204 i3=(int)tempBaseDirPath.size();i4=0; 195 205 while(i4<i2){ 196 206 for(i3--;;i3--){ 197 if( baseDirPath[i3-1]=='\\'){207 if(tempBaseDirPath[i3-1]=='\\'){ 198 208 i4++; 199 209 break; … … 201 211 } 202 212 } 203 memcpy(temporary, baseDirPath.c_str(),i3);213 memcpy(temporary,tempBaseDirPath.c_str(),i3); 204 214 temporary[i3]=0; 205 215 lstrcat(temporary,path+i); … … 601 611 pobj_nv->load(); 602 612 613 program.Configurate(); 614 603 615 if( !program.AnalysisCommandLines() ) 604 616 { … … 664 676 if( program.GetIncludeDir().size() == 0 ) 665 677 { 666 program.SetIncludeDir( Jenga::Common::Path::MakeFullPath( ".\\Include \\", baseDirPath) );678 program.SetIncludeDir( Jenga::Common::Path::MakeFullPath( ".\\Include", ActiveBasic::Common::Environment::GetAbdevRootPath() ) ); 667 679 } 668 680 else 669 681 { 670 682 // インクルードディレクトリを絶対パスに変更 671 program.SetIncludeDir( Jenga::Common::Path::MakeFullPath( program.GetIncludeDir(), baseDirPath) );683 program.SetIncludeDir( Jenga::Common::Path::MakeFullPath( program.GetIncludeDir(), ActiveBasic::Common::Environment::GetAbdevRootPath() ) ); 672 684 } 673 685 -
trunk/ab5.0/abdev/BasicCompiler_Common/common.h
r467 r477 216 216 void ts(const char *msg); 217 217 void ts(const char *msg,const char *title); 218 void ts(const std::string msg); 218 219 void epi_check(); 219 220 void GetRelationalPath(char *path,char *dir); -
trunk/ab5.0/abdev/BasicCompiler_Common/include/Program.h
r472 r477 28 28 { 29 29 } 30 31 void Configurate(); 30 32 31 33 bool AnalysisCommandLines(); -
trunk/ab5.0/abdev/BasicCompiler_Common/src/BoostSerializationSupport.cpp
r404 r477 485 485 486 486 #include <logger.h> 487 #include <Configuration.h> 487 488 488 489 template class Jenga::Common::BoostSerializationSupport<LoggerSetting>; 490 template class Jenga::Common::BoostSerializationSupport<Configuration>; -
trunk/ab5.0/abdev/BasicCompiler_Common/src/Delegate.cpp
r465 r477 163 163 destSource = ""; 164 164 165 SourceTemplate sourceTemplate( "\\SubOperation\\templates\\delegate_class.tab" );165 SourceTemplate sourceTemplate( ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\templates\\delegate_class.tab" ); 166 166 167 167 this->Iterator_Reset(); -
trunk/ab5.0/abdev/BasicCompiler_Common/src/Program.cpp
r472 r477 10 10 11 11 Program program; 12 13 void Program::Configurate() 14 { 15 Configuration configuration; 16 const std::string filePath = Jenga::Common::Environment::GetAppDir() + "\\config.xml"; 17 if( Jenga::Common::Path( filePath ).IsExistFile() ) 18 { 19 configuration.ReadXml( filePath ); 20 } 21 else 22 { 23 configuration.WriteXml( filePath ); 24 } 25 26 ActiveBasic::Common::Environment::SetAbdevRootPath( configuration.GetAbdevRootRelativePath() ); 27 } 12 28 13 29 bool Program::AnalysisCommandLines() -
trunk/ab5.0/abdev/BasicCompiler_Common/src/Source.cpp
r467 r477 614 614 615 615 if(sw1){ 616 sprintf(temp2,"%s %s", program.GetIncludeDir().c_str(), temporary );616 sprintf(temp2,"%s\\%s", program.GetIncludeDir().c_str(), temporary ); 617 617 lstrcpy(temporary,temp2); 618 618 } … … 624 624 else if(memcmp(buffer+i+1,"prompt",6)==0){ 625 625 i2=i+7; 626 sprintf(temporary,"%s basic\\prompt.sbp", program.GetIncludeDir().c_str() );626 sprintf(temporary,"%s\\basic\\prompt.sbp", program.GetIncludeDir().c_str() ); 627 627 } 628 628 else if(memcmp(buffer+i+1,"N88BASIC",8)==0){ 629 629 i2=i+9; 630 sprintf(temporary,"%s basic\\prompt.sbp", program.GetIncludeDir().c_str() );630 sprintf(temporary,"%s\\basic\\prompt.sbp", program.GetIncludeDir().c_str() ); 631 631 } 632 632 else if(memcmp(buffer+i+1,"console",7)==0){ … … 636 636 637 637 i2=i+8; 638 sprintf(temporary,"%s basic\\dos_console.sbp", program.GetIncludeDir().c_str() );638 sprintf(temporary,"%s\\basic\\dos_console.sbp", program.GetIncludeDir().c_str() ); 639 639 } 640 640 else continue; -
trunk/ab5.0/abdev/ProjectEditor/Attach.cpp
r475 r477 91 91 ///////////////////////////////////////////////////// 92 92 93 std::string enumProcess64ExePath = Program::GetApplicationSystemDirPath() + "\\enum_process64\\enum_process64.exe";93 std::string enumProcess64ExePath = ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\enum_process64\\enum_process64.exe"; 94 94 95 95 STARTUPINFO si; … … 106 106 ////////////////////////////////// 107 107 108 std::string listPath = Program::GetApplicationSystemDirPath() + "\\enum_process64\\list.dat";108 std::string listPath = ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\enum_process64\\list.dat"; 109 109 110 110 char *buffer; -
trunk/ab5.0/abdev/ProjectEditor/ChildWndOnRebar.cpp
r475 r477 85 85 i=SendMessage(hwnd,CB_GETCURSEL,0,0); 86 86 87 extern char *lpszCompilerName; 88 if(i==0) lpszCompilerName=WIN32_COMPILER_NAME; 89 if(i==1) lpszCompilerName=WIN64_COMPILER_NAME; 87 extern ActiveBasic::Common::Platform::EnumType selectingPlatform; 88 if( i == 0 ) 89 { 90 selectingPlatform = ActiveBasic::Common::Platform::X86; 91 } 92 else if( i == 1 ) 93 { 94 selectingPlatform = ActiveBasic::Common::Platform::X64; 95 } 90 96 } 91 97 break; -
trunk/ab5.0/abdev/ProjectEditor/Common.h
r475 r477 69 69 #endif 70 70 71 72 73 #define WIN32_COMPILER_NAME "BasicCompiler32.exe"74 #define WIN64_COMPILER_NAME "BasicCompiler64.exe"75 71 76 72 -
trunk/ab5.0/abdev/ProjectEditor/DesignTheme.cpp
r475 r477 39 39 } 40 40 CTheme::CTheme(){ 41 CTheme(0,THEMENAME_USER); 41 bActive=0; 42 lstrcpy(m_name,THEMENAME_USER); 42 43 } 43 44 CTheme::~CTheme(){ -
trunk/ab5.0/abdev/ProjectEditor/ProjectControl.cpp
r475 r477 898 898 } 899 899 else if(NewProjectInfo.dwTypeID==IDC_EXE_DIRECTX){ 900 const std::string mainExeDirectXAbpPath = Program::GetApplicationSystemDirPath() + "\\system\\dx\\main_exe_directx.abp";900 const std::string mainExeDirectXAbpPath = ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\dx\\main_exe_directx.abp"; 901 901 pTemp = ReadBuffer( mainExeDirectXAbpPath ); 902 902 … … 969 969 if(NewProjectInfo.dwTypeID==IDC_EXE_WINDOWBASE) 970 970 { 971 mainWndSbpPath = Program::GetApplicationSystemDirPath() + "\\MainWnd_exe_windowbase.sbp";971 mainWndSbpPath = ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\MainWnd_exe_windowbase.sbp"; 972 972 } 973 973 else if(NewProjectInfo.dwTypeID==IDC_EXE_DIRECTX) 974 974 { 975 mainWndSbpPath = Program::GetApplicationSystemDirPath() + "\\MainWnd_exe_directx.sbp";975 mainWndSbpPath = ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\MainWnd_exe_directx.sbp"; 976 976 } 977 977 … … 1017 1017 1018 1018 //dx_graphics.sbpをコピー 1019 const std::string dxGraphicsSbpPath = Program::GetApplicationSystemDirPath() + "\\dx\\dx_graphics.sbp";1019 const std::string dxGraphicsSbpPath = ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\dx\\dx_graphics.sbp"; 1020 1020 pTemp = ReadBuffer( dxGraphicsSbpPath ); 1021 1021 sprintf(temporary,"%sdx_graphics.sbp",dir,NewProjectInfo.name); … … 1024 1024 1025 1025 //dx_input.sbpをコピー 1026 const std::string dxInputSbpPath = Program::GetApplicationSystemDirPath() + "\\dx\\dx_input.sbp";1026 const std::string dxInputSbpPath = ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\dx\\dx_input.sbp"; 1027 1027 pTemp = ReadBuffer( dxInputSbpPath ); 1028 1028 sprintf(temporary,"%sdx_input.sbp",dir,NewProjectInfo.name); … … 1031 1031 1032 1032 //dx_music.sbpをコピー 1033 const std::string dxMusicSbpPath = Program::GetApplicationSystemDirPath() + "\\dx\\dx_music.sbp";1033 const std::string dxMusicSbpPath = ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\dx\\dx_music.sbp"; 1034 1034 pTemp = ReadBuffer( dxMusicSbpPath ); 1035 1035 sprintf(temporary,"%sdx_music.sbp",dir,NewProjectInfo.name); … … 1097 1097 //マニフェストを作成 1098 1098 char temp2[MAX_PATH]; 1099 const std::string manifestTempXmlPath = Program::GetApplicationSystemDirPath() + "\\manifest_temp.xml";1099 const std::string manifestTempXmlPath = ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\manifest_temp.xml"; 1100 1100 sprintf(temp2,"%s%s.manifest.xml",dir,NewProjectInfo.name); 1101 1101 CopyFile( manifestTempXmlPath.c_str(), temp2, 0 ); … … 2372 2372 BOOL SetProjectToRun(void){ 2373 2373 extern PROJECTINFO ProjectInfo; 2374 char temporary[MAX_PATH];2375 2374 HANDLE hFind; 2376 2375 WIN32_FIND_DATA wfd; … … 2382 2381 } 2383 2382 2384 extern char *lpszCompilerName; 2385 sprintf(temporary,"%s%s",pj_editor_Dir,lpszCompilerName); 2386 hFind=FindFirstFile(temporary,&wfd); 2383 extern ActiveBasic::Common::Platform::EnumType selectingPlatform; 2384 hFind=FindFirstFile( ActiveBasic::Common::Environment::GetCompilerExePath( selectingPlatform ).c_str(), &wfd ); 2387 2385 if(hFind==INVALID_HANDLE_VALUE){ 2388 2386 //"BasicCompiler.exe が見つかりません" -
trunk/ab5.0/abdev/ProjectEditor/ProjectEditor.cpp
r475 r477 89 89 90 90 91 void CreateProcessWithStdHandle( const char *appPath, const char *cmdLine)91 void CreateProcessWithStdHandle( const std::string &appPath, const std::string &cmdLine) 92 92 { 93 93 std::string argsStr = (std::string)"\"" + appPath + "\" " + cmdLine; … … 2082 2082 lstrcat(temporary,temp2); 2083 2083 2084 sprintf(str,"%s%s",pj_editor_Dir,lpszCompilerName); 2085 2086 CreateProcessWithStdHandle( str, temporary ); 2084 CreateProcessWithStdHandle( ActiveBasic::Common::Environment::GetCompilerExePath( selectingPlatform ), temporary ); 2087 2085 2088 2086 return 0; … … 2134 2132 lstrcat(temporary,temp2); 2135 2133 2136 sprintf(str,"%s%s",pj_editor_Dir,lpszCompilerName); 2137 2138 CreateProcessWithStdHandle( str, temporary ); 2134 CreateProcessWithStdHandle( ActiveBasic::Common::Environment::GetCompilerExePath( selectingPlatform ), temporary ); 2139 2135 2140 2136 return 0; … … 2167 2163 lstrcat(temporary,temp2); 2168 2164 2165 ActiveBasic::Common::Platform::EnumType platform; 2169 2166 if(dwPlatform==IMAGE_FILE_MACHINE_I386) 2170 sprintf(str,"%s%s",pj_editor_Dir,WIN32_COMPILER_NAME); 2167 { 2168 platform = ActiveBasic::Common::Platform::X86; 2169 } 2171 2170 else if(dwPlatform==IMAGE_FILE_MACHINE_AMD64) 2172 sprintf(str,"%s%s",pj_editor_Dir,WIN64_COMPILER_NAME); 2173 2174 CreateProcessWithStdHandle( str, temporary ); 2171 { 2172 platform = ActiveBasic::Common::Platform::X64; 2173 } 2174 else 2175 { 2176 throw; 2177 } 2178 2179 CreateProcessWithStdHandle( ActiveBasic::Common::Environment::GetCompilerExePath( platform ), temporary ); 2175 2180 2176 2181 return 0; … … 2222 2227 lstrcat(temporary,temp2); 2223 2228 2224 sprintf(str,"%s%s",pj_editor_Dir,lpszCompilerName); 2225 2226 CreateProcessWithStdHandle( str, temporary ); 2229 CreateProcessWithStdHandle( ActiveBasic::Common::Environment::GetCompilerExePath( selectingPlatform ), temporary ); 2227 2230 2228 2231 return 0; -
trunk/ab5.0/abdev/ProjectEditor/ProjectEditor.h
r83 r477 39 39 HBRUSH h3DFaceBackBrush; 40 40 DWORD dwRadClipboardID; 41 char *lpszCompilerName;41 ActiveBasic::Common::Platform::EnumType selectingPlatform = ActiveBasic::Common::Platform::X86; 42 42 43 43 FWINLAYER pSetLayeredWindowAttributes; -
trunk/ab5.0/abdev/ProjectEditor/ProjectEditor.vcproj
r475 r477 411 411 </Configurations> 412 412 <References> 413 <ProjectReference 414 ReferencedProjectIdentifier="{87835C33-64C9-4BA5-9B39-608BA5394387}" 415 RelativePathToProject=".\ab_common\ab_common.vcproj" 416 /> 417 <ProjectReference 418 ReferencedProjectIdentifier="{F01805B6-65B4-4708-88F4-A5E07DEA9FBD}" 419 RelativePathToProject="..\jenga\projects\jenga\jenga.vcproj" 420 /> 413 421 </References> 414 422 <Files> -
trunk/ab5.0/abdev/ProjectEditor/SubOperation.cpp
r475 r477 911 911 912 912 //リソース用DLLをマッピング 913 const std::string resDllPath = Program::GetApplicationSystemDirPath() + "\\res.dll";913 const std::string resDllPath = ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\res.dll"; 914 914 hResInst = LoadLibrary( resDllPath.c_str() ); 915 915 916 916 //アイコンリソースDLLをマッピング 917 const std::string iconResDllPath = Program::GetApplicationSystemDirPath() + "\\icon_res.dll";917 const std::string iconResDllPath = ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\icon_res.dll"; 918 918 hIconResInst = LoadLibrary( iconResDllPath.c_str() ); 919 919 920 920 //LuxCtrl.dllをマッピング 921 const std::string luxCtrlDllPath = Program::GetApplicationSystemDirPath() + "\\LuxCtrl.dll";921 const std::string luxCtrlDllPath = ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\LuxCtrl.dll"; 922 922 hLib_LuxCtrl = LoadLibrary( luxCtrlDllPath.c_str() ); 923 923 if(!hLib_LuxCtrl){ … … 949 949 ScreenX=GetSystemMetrics(SM_CXSCREEN); 950 950 ScreenY=GetSystemMetrics(SM_CYSCREEN); 951 952 //コンパイラ名をセット(デフォルトはWin32)953 extern char *lpszCompilerName;954 lpszCompilerName=WIN32_COMPILER_NAME;955 951 956 952 //不揮発性のデータを取得 … … 1220 1216 HANDLE hFile; 1221 1217 DWORD dw; 1222 const std::string pltPath = Program::GetApplicationSystemDirPath() + "\\8bit.plt";1218 const std::string pltPath = ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\8bit.plt"; 1223 1219 hFile=CreateFile(pltPath.c_str(),GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL); 1224 1220 if(hFile==INVALID_HANDLE_VALUE){ … … 1473 1469 extern LPSTR DefFileFilter; 1474 1470 int WndNum; 1475 char temp orary[MAX_PATH],temp2[MAX_PATH];1471 char temp2[MAX_PATH]; 1476 1472 HANDLE hFind; 1477 1473 WIN32_FIND_DATA wfd; 1478 1474 1479 extern char *lpszCompilerName; 1480 sprintf(temporary,"%s%s",pj_editor_Dir,lpszCompilerName); 1481 hFind=FindFirstFile(temporary,&wfd); 1475 extern ActiveBasic::Common::Platform::EnumType selectingPlatform; 1476 hFind=FindFirstFile(ActiveBasic::Common::Environment::GetCompilerExePath( selectingPlatform ).c_str(),&wfd); 1482 1477 if(hFind==INVALID_HANDLE_VALUE){ 1483 1478 //"BasicCompiler.exe が見つかりません" -
trunk/ab5.0/abdev/ProjectEditor/WindowControl.cpp
r475 r477 2259 2259 2260 2260 //テンプレートを読み込む 2261 const std::string newWindowTemplateSbpPath = Program::GetApplicationSystemDirPath() + "\\new_window_template.sbp";2261 const std::string newWindowTemplateSbpPath = ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\new_window_template.sbp"; 2262 2262 pTemp = ReadBuffer( newWindowTemplateSbpPath ); 2263 2263 -
trunk/ab5.0/abdev/ProjectEditor/common_msg_jpn.h
r83 r477 78 78 #define STRING_FILE_OVERWRIDE "\"%s\" ファイルは既に存在しています。上書きしますか?" 79 79 #define STRING_ERROR_MAXLENGTH "これ以上、テキストを入力することができません" 80 #define STRING_ERROR_NOBASICCOMPILER " BasicCompilerが見つかりません"80 #define STRING_ERROR_NOBASICCOMPILER "対象プラットフォームのビルドモジュールが見つかりません" 81 81 #define STRING_ERROR_PROJECTTOPCHAR "プロジェクト名の先頭文字はアルファベット(A~Z、a~z)またはアンダーバー(_)でなければなりません。" 82 82 #define STRING_ERROR_PROJECTNAME "プロジェクト名に不正な文字コードが含まれています。" -
trunk/ab5.0/abdev/ProjectEditor/include/Program.h
r475 r477 7 7 { 8 8 public: 9 static const std::string GetApplicationSystemDirPath()10 {11 return Jenga::Common::Environment::GetAppDir() + "\\system";12 }13 9 }; 14 10 -
trunk/ab5.0/abdev/ProjectEditor/nkf_class.cpp
r475 r477 10 10 CNkf::CNkf() 11 11 { 12 const std::string nkf32DllPath = Program::GetApplicationSystemDirPath() + "\\system\\nkf32.dll";12 const std::string nkf32DllPath = ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\nkf32.dll"; 13 13 hLib = LoadLibrary( nkf32DllPath.c_str() ); 14 if( !hLib ) 15 { 16 MessageBox( NULL, "nkf32.dll が見つかりません。", "エラー", MB_OK | MB_ICONEXCLAMATION ); 17 } 14 18 15 19 pGetNkfVersion=(GetNkfVersion)GetProcAddress(hLib,"GetNkfVersion"); -
trunk/ab5.0/abdev/ProjectEditor/reg_exp.cpp
r475 r477 9 9 CRegExp::CRegExp() 10 10 { 11 const std::string bregexpDllPath = Program::GetApplicationSystemDirPath() + "\\system\\BREGEXP.dll";11 const std::string bregexpDllPath = ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\BREGEXP.dll"; 12 12 hLib = LoadLibrary( bregexpDllPath.c_str() ); 13 if( !hLib ) 14 { 15 MessageBox( NULL, "BREGEXP.dll �����Â���Ü��B", "Gñ��[", MB_OK | MB_ICONEXCLAMATION ); 16 } 13 17 14 18 BMatch=(PFUNC_BMatch)GetProcAddress(hLib,"BMatch"); … … 37 41 else sprintf(pTemp,"m/(%s)/",exp); 38 42 39 //Shift-JIS ナ表43 //Shift-JIS? 40 44 lstrcat(pTemp,"k"); 41 45 42 // 蝠カE46 //?E 43 47 if(!IsBigSmall) lstrcat(pTemp,"i"); 44 48 … … 81 85 else sprintf(pTemp,"s/%s/%s/",exp,szPermu); 82 86 83 //Shift-JIS ナ表87 //Shift-JIS? 84 88 lstrcat(pTemp,"k"); 85 89 86 // 蝠カE90 //?E 87 91 if(!IsBigSmall) lstrcat(pTemp,"i"); 88 92 -
trunk/ab5.0/abdev/ProjectEditor/stdafx.h
r475 r477 28 28 #include <jenga/include/common/String.h> 29 29 30 #include <abdev/ab_common/Environment.h> 31 30 32 #include <Program.h> -
trunk/ab5.0/abdev/ab_common/Environment.h
r475 r477 4 4 5 5 6 struct Platform 7 { 8 enum EnumType 9 { 10 X86, 11 X64, 12 }; 13 }; 14 6 15 class Environment 7 16 { 17 static std::string rootPath; 8 18 public: 9 static const std::string GetAbdevRootPath(); 10 static const std::string GetX86CompilerExePath(); 11 static const std::string GetX64CompilerExePath(); 19 static void SetAbdevRootPath( const std::string &rootPath ); 20 21 static const std::string GetAbdevRootPath() 22 { 23 return rootPath; 24 } 25 26 static const std::string GetAbdevSystemDirPath() 27 { 28 return GetAbdevRootPath() + "\\system"; 29 } 30 31 static const std::string GetCompilerExePath( Platform::EnumType platform ); 12 32 }; 13 33 -
trunk/ab5.0/abdev/ab_common/ab_common.vcproj
r475 r477 150 150 > 151 151 <File 152 RelativePath=".\Environment.cpp" 153 > 154 </File> 155 <File 152 156 RelativePath=".\stdafx.cpp" 153 157 > … … 190 194 > 191 195 </Filter> 192 <File193 RelativePath=".\ReadMe.txt"194 >195 </File>196 196 </Files> 197 197 <Globals> -
trunk/ab5.0/abdev/ab_common/stdafx.h
r475 r477 22 22 #include <boost/foreach.hpp> 23 23 24 #include <jenga/include/common/CmdLine.h> 25 #include <jenga/include/common/Environment.h> 26 #include <jenga/include/common/File.h> 27 #include <jenga/include/common/Path.h> 24 28 #include <jenga/include/common/String.h> 25 #include <jenga/include/common/File.h>26 #include <jenga/include/common/CmdLine.h>27 #include <jenga/include/common/Path.h>28 29 29 30 #include "Environment.h" -
trunk/ab5.0/jenga/include/common/Environment.h
r205 r477 37 37 return appDir; 38 38 } 39 40 static const std::string &GetAppFileName() 41 { 42 static std::string appFileName; 43 if( appFileName.size() == 0 ) 44 { 45 char temporary[MAX_PATH]; 46 char temp2[MAX_PATH]; 47 char temp3[MAX_PATH]; 48 GetModuleFileName(GetModuleHandle(0),temporary,MAX_PATH); 49 _splitpath(temporary,NULL,NULL,temp2,temp3); 50 lstrcat(temp2,temp3); 51 52 appFileName = temp2; 53 } 54 return appFileName; 55 } 56 57 static const std::string &GetAppFilePath() 58 { 59 static std::string appFilePath; 60 if( appFilePath.size() == 0 ) 61 { 62 char temporary[MAX_PATH]; 63 GetModuleFileName(GetModuleHandle(0),temporary,MAX_PATH); 64 65 appFilePath = temporary; 66 } 67 return appFilePath; 68 } 39 69 }; 40 70 -
trunk/ab5.0/jenga/src/common/Path.cpp
r467 r477 50 50 } 51 51 52 i3=(int)baseDirPath.size();i4=0; 52 std::string tempBaseDirPath = baseDirPath; 53 if( tempBaseDirPath[tempBaseDirPath.size()-1] != '\\' ) 54 { 55 tempBaseDirPath += "\\"; 56 } 57 58 i3=(int)tempBaseDirPath.size();i4=0; 53 59 while(i4<i2){ 54 60 for(i3--;;i3--){ 55 if( baseDirPath[i3-1]=='\\'){61 if(tempBaseDirPath[i3-1]=='\\'){ 56 62 i4++; 57 63 break; … … 59 65 } 60 66 } 61 memcpy(temporary, baseDirPath.c_str(),i3);67 memcpy(temporary,tempBaseDirPath.c_str(),i3); 62 68 temporary[i3]=0; 63 69 lstrcat(temporary,resultPath+i); 64 70 lstrcpy(resultPath,temporary); 65 71 72 if( resultPath[lstrlen(resultPath)-1] == '\\' ) 73 { 74 resultPath[lstrlen(resultPath)-1] = 0; 75 } 76 66 77 return resultPath; 67 78 }
Note:
See TracChangeset
for help on using the changeset viewer.