Index: /trunk/ab5.0/abdev/BasicCompiler32/BasicCompiler.vcproj =================================================================== --- /trunk/ab5.0/abdev/BasicCompiler32/BasicCompiler.vcproj (revision 474) +++ /trunk/ab5.0/abdev/BasicCompiler32/BasicCompiler.vcproj (revision 475) @@ -16,6 +16,6 @@ + + Index: /trunk/ab5.0/abdev/BasicCompiler64/BasicCompiler.vcproj =================================================================== --- /trunk/ab5.0/abdev/BasicCompiler64/BasicCompiler.vcproj (revision 474) +++ /trunk/ab5.0/abdev/BasicCompiler64/BasicCompiler.vcproj (revision 475) @@ -17,6 +17,6 @@ + Index: /trunk/ab5.0/abdev/BasicCompiler_Common/include/logger.h =================================================================== --- /trunk/ab5.0/abdev/BasicCompiler_Common/include/logger.h (revision 474) +++ /trunk/ab5.0/abdev/BasicCompiler_Common/include/logger.h (revision 475) @@ -73,5 +73,10 @@ char temp3[MAX_PATH]; _splitpath(saveFilePath.c_str(),temporary,temp2,temp3,NULL); - setting.ReadXml( (string)temporary + temp2 + temp3 + ".setting.xml", false ); + + std::string settingXmlPath = (std::string)temporary + temp2 + temp3 + ".setting.xml"; + if( Jenga::Common::Path( settingXmlPath ).IsExistFile() ) + { + setting.ReadXml( settingXmlPath, false ); + } } } Index: /trunk/ab5.0/abdev/ProjectEditor/Attach.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/Attach.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/Attach.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #ifndef THETEXT @@ -6,4 +8,6 @@ #pragma comment(lib, "psapi.lib") + +using namespace ActiveBasic::IDE; @@ -78,7 +82,6 @@ } -void ListupProcesses64(HWND hListView){ - char temporary[MAX_PATH]; - +void ListupProcesses64(HWND hListView) +{ ListView_DeleteAllItems(hListView); @@ -88,5 +91,5 @@ ///////////////////////////////////////////////////// - sprintf(temporary,"%sSubOperation\\enum_process64\\enum_process64.exe",pj_editor_Dir); + std::string enumProcess64ExePath = Program::GetApplicationSystemDirPath() + "\\enum_process64\\enum_process64.exe"; STARTUPINFO si; @@ -94,5 +97,5 @@ memset(&si,0,sizeof(STARTUPINFO)); si.cb=sizeof(STARTUPINFO); - CreateProcess(NULL,temporary,NULL,NULL,0,NORMAL_PRIORITY_CLASS,NULL,NULL,&si,&pi); + CreateProcess(NULL,const_cast(enumProcess64ExePath.c_str()),NULL,NULL,0,NORMAL_PRIORITY_CLASS,NULL,NULL,&si,&pi); WaitForSingleObject(pi.hProcess,INFINITE); @@ -103,16 +106,17 @@ ////////////////////////////////// - sprintf(temporary,"%sSubOperation\\enum_process64\\list.dat",pj_editor_Dir); + std::string listPath = Program::GetApplicationSystemDirPath() + "\\enum_process64\\list.dat"; char *buffer; - buffer=ReadBuffer_NonErrMsg(temporary); + buffer=ReadBuffer_NonErrMsg( listPath ); if(!buffer) return; int i=0; + char temporary[MAX_PATH]; while(1){ //ファイルパス char szAppPath[MAX_PATH]; i=GetOneParameter(buffer,i,szAppPath); - if(temporary[0]=='\0') break; + if(szAppPath[0]=='\0') break; RemoveStringQuotes(szAppPath); Index: /trunk/ab5.0/abdev/ProjectEditor/Backup.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/Backup.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/Backup.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/CClassInfo.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/CClassInfo.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/CClassInfo.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "Common.h" @@ -296,2 +298,3 @@ } + Index: /trunk/ab5.0/abdev/ProjectEditor/CFileInfo.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/CFileInfo.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/CFileInfo.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/Caret.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/Caret.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/Caret.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/ChildWndOnRebar.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/ChildWndOnRebar.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/ChildWndOnRebar.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "Common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/ClassTree.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/ClassTree.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/ClassTree.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "Common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/CodeFormatter.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/CodeFormatter.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/CodeFormatter.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/Common.h =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/Common.h (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/Common.h (revision 475) @@ -1,3 +1,2 @@ -#define STRICT #define OEMRESOURCE #define _CRT_SECURE_NO_DEPRECATE //セキュリティ警告を出さない @@ -777,6 +776,6 @@ //FileOperation.cpp void MakeUserSettingDir(void); -char *ReadBuffer(char *path); -char *ReadBuffer_NonErrMsg(char *path); +char *ReadBuffer( const std::string &path ); +char *ReadBuffer_NonErrMsg( const std::string &path ); _int8 WriteBuffer(char *path,char *buffer,int length, bool isEnableError = true); _int8 WriteBuffer_NonErrMsg(char *path,char *buffer,int length); Index: /trunk/ab5.0/abdev/ProjectEditor/Complement.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/Complement.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/Complement.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/Debugger.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/Debugger.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/Debugger.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/DesignTheme.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/DesignTheme.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/DesignTheme.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/DialogBoxes.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/DialogBoxes.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/DialogBoxes.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "Common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/DocumentAdvice.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/DocumentAdvice.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/DocumentAdvice.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "Common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/DrawBuffer.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/DrawBuffer.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/DrawBuffer.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "Common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/DrawWindow.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/DrawWindow.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/DrawWindow.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "Common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/EndPairCommandComplement.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/EndPairCommandComplement.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/EndPairCommandComplement.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/ExtensionLink.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/ExtensionLink.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/ExtensionLink.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/FileOperation.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/FileOperation.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/FileOperation.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "Common.h" @@ -17,5 +19,5 @@ } -char *ReadBuffer(char *path){ +char *ReadBuffer( const std::string &path ){ extern HANDLE hHeap; int i; @@ -24,8 +26,8 @@ HANDLE hFile; - hFile=CreateFile(path,GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL); + hFile=CreateFile(path.c_str(),GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL); if(hFile==INVALID_HANDLE_VALUE){ //"\"%s\" ファイルの読み込みに失敗しました。" - sprintf(temporary,STRING_ERROR_CANT_FILEOPEN,path); + sprintf(temporary,STRING_ERROR_CANT_FILEOPEN,path.c_str()); MessageBox(hOwner,temporary,STRING_ERROR,MB_OK|MB_ICONEXCLAMATION); @@ -39,5 +41,5 @@ return buffer; } -char *ReadBuffer_NonErrMsg(char *path){ +char *ReadBuffer_NonErrMsg( const std::string &path ){ extern HANDLE hHeap; int i; @@ -46,5 +48,5 @@ HANDLE hFile; - hFile=CreateFile(path,GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL); + hFile=CreateFile(path.c_str(),GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL); if(hFile==INVALID_HANDLE_VALUE) return 0; i=GetFileSize(hFile,0); Index: /trunk/ab5.0/abdev/ProjectEditor/FileTree.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/FileTree.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/FileTree.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/History.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/History.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/History.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/HtmlAnalysis.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/HtmlAnalysis.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/HtmlAnalysis.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/IconEditor.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/IconEditor.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/IconEditor.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "Common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/IconEditor_Color.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/IconEditor_Color.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/IconEditor_Color.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/IconEditor_Main.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/IconEditor_Main.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/IconEditor_Main.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "Common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/IconEditor_Tool.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/IconEditor_Tool.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/IconEditor_Tool.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/IconEditor_UndoRedo.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/IconEditor_UndoRedo.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/IconEditor_UndoRedo.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/LuxCtrl.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/LuxCtrl.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/LuxCtrl.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/MdiTextEdit.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/MdiTextEdit.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/MdiTextEdit.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/MenuProc.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/MenuProc.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/MenuProc.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "Common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/MessageCallOperation.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/MessageCallOperation.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/MessageCallOperation.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "Common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/NonVolatile.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/NonVolatile.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/NonVolatile.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/ParameterHint.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/ParameterHint.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/ParameterHint.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/Print.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/Print.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/Print.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/ProjectControl.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/ProjectControl.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/ProjectControl.cpp (revision 475) @@ -1,3 +1,7 @@ +#include "stdafx.h" + #include "Common.h" + +using namespace ActiveBasic::IDE; #if defined(JPN) @@ -894,6 +898,6 @@ } else if(NewProjectInfo.dwTypeID==IDC_EXE_DIRECTX){ - sprintf(temporary,"%sSubOperation\\dx\\main_exe_directx.abp",pj_editor_Dir); - pTemp=ReadBuffer(temporary); + const std::string mainExeDirectXAbpPath = Program::GetApplicationSystemDirPath() + "\\system\\dx\\main_exe_directx.abp"; + pTemp = ReadBuffer( mainExeDirectXAbpPath ); //#name#をプロジェクト名に置換 @@ -962,20 +966,16 @@ ///////////////////// - if(NewProjectInfo.dwTypeID==IDC_EXE_WINDOWBASE){ -#if defined(JPN) - //日本語ファイル - sprintf(temporary,"%sSubOperation\\MainWnd_exe_windowbase.sbp",pj_editor_Dir); -#else - //英語ファイル - sprintf(temporary,"%sSubOperation\\MainWnd_exe_windowbase_e.sbp",pj_editor_Dir); -#endif + std::string mainWndSbpPath = ""; + if(NewProjectInfo.dwTypeID==IDC_EXE_WINDOWBASE) + { + mainWndSbpPath = Program::GetApplicationSystemDirPath() + "\\MainWnd_exe_windowbase.sbp"; } else if(NewProjectInfo.dwTypeID==IDC_EXE_DIRECTX) - sprintf(temporary,"%sSubOperation\\dx\\MainWnd_exe_directx.sbp",pj_editor_Dir); - else - temporary[0]=0; - - if(temporary[0]){ - pTemp=ReadBuffer(temporary); + { + mainWndSbpPath = Program::GetApplicationSystemDirPath() + "\\MainWnd_exe_directx.sbp"; + } + + if( !mainWndSbpPath.empty() ){ + pTemp = ReadBuffer( mainWndSbpPath ); //#name#をプロジェクト名に置換 @@ -1017,6 +1017,6 @@ //dx_graphics.sbpをコピー - sprintf(temporary,"%sSubOperation\\dx\\dx_graphics.sbp",pj_editor_Dir); - pTemp=ReadBuffer(temporary); + const std::string dxGraphicsSbpPath = Program::GetApplicationSystemDirPath() + "\\dx\\dx_graphics.sbp"; + pTemp = ReadBuffer( dxGraphicsSbpPath ); sprintf(temporary,"%sdx_graphics.sbp",dir,NewProjectInfo.name); WriteBuffer(temporary,pTemp,lstrlen(pTemp)); @@ -1024,6 +1024,6 @@ //dx_input.sbpをコピー - sprintf(temporary,"%sSubOperation\\dx\\dx_input.sbp",pj_editor_Dir); - pTemp=ReadBuffer(temporary); + const std::string dxInputSbpPath = Program::GetApplicationSystemDirPath() + "\\dx\\dx_input.sbp"; + pTemp = ReadBuffer( dxInputSbpPath ); sprintf(temporary,"%sdx_input.sbp",dir,NewProjectInfo.name); WriteBuffer(temporary,pTemp,lstrlen(pTemp)); @@ -1031,6 +1031,6 @@ //dx_music.sbpをコピー - sprintf(temporary,"%sSubOperation\\dx\\dx_music.sbp",pj_editor_Dir); - pTemp=ReadBuffer(temporary); + const std::string dxMusicSbpPath = Program::GetApplicationSystemDirPath() + "\\dx\\dx_music.sbp"; + pTemp = ReadBuffer( dxMusicSbpPath ); sprintf(temporary,"%sdx_music.sbp",dir,NewProjectInfo.name); WriteBuffer(temporary,pTemp,lstrlen(pTemp)); @@ -1097,7 +1097,7 @@ //マニフェストを作成 char temp2[MAX_PATH]; - sprintf(temporary,"%sSubOperation\\manifest_temp.xml",pj_editor_Dir); + const std::string manifestTempXmlPath = Program::GetApplicationSystemDirPath() + "\\manifest_temp.xml"; sprintf(temp2,"%s%s.manifest.xml",dir,NewProjectInfo.name); - CopyFile(temporary,temp2,0); + CopyFile( manifestTempXmlPath.c_str(), temp2, 0 ); Index: /trunk/ab5.0/abdev/ProjectEditor/ProjectEditor.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/ProjectEditor.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/ProjectEditor.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "ProjectEditor.h" Index: /trunk/ab5.0/abdev/ProjectEditor/ProjectEditor.vcproj =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/ProjectEditor.vcproj (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/ProjectEditor.vcproj (revision 475) @@ -5,4 +5,5 @@ Name="ProjectEditor" ProjectGUID="{DC1B787E-510F-4F7D-8F9A-182600904D83}" + RootNamespace="ProjectEditor" > @@ -15,199 +16,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -724,21 +429,13 @@ - - - - - - + + + - - - - - - @@ -784,21 +465,13 @@ - - - - - - + + + - - - - - - @@ -844,21 +501,13 @@ - - - - - - + + + - - - - - - @@ -904,21 +537,13 @@ - - - - - - + + + - - - - - - @@ -964,21 +573,13 @@ - - - - - - + + + - - - - - - @@ -1024,21 +609,13 @@ - - - - - - + + + + + + + + + + + - - - - - - - - - + + + + + + @@ -1111,6 +700,6 @@ > @@ -1120,20 +709,4 @@ > - - - - - - @@ -1144,21 +717,13 @@ - - - - - - + + + - - - - - - @@ -1207,21 +756,13 @@ - - - - - - + + + - - - - - - @@ -1271,21 +796,13 @@ - - - - - - + + + - - - - - - @@ -1339,21 +840,13 @@ - - - - - - + + + - - - - - - @@ -1399,21 +876,13 @@ - - - - - - + + + - - - - - - @@ -1459,21 +912,13 @@ - - - - - - + + + - - - - - - @@ -1522,21 +951,13 @@ - - - - - - + + + - - - - - - @@ -1582,21 +987,13 @@ - - - - - - + + + - - - - - - @@ -1646,21 +1027,13 @@ - - - - - - + + + - - - - - - @@ -1706,21 +1063,13 @@ - - - - - - + + + - - - - - - @@ -1775,21 +1108,13 @@ - - - - - - + + + - - - - - - @@ -1835,21 +1144,13 @@ - - - - - - + + + - - - - - - @@ -1895,21 +1180,13 @@ - - - - - - + + + - - - - - - @@ -1955,21 +1216,13 @@ - - - - - - + + + - - - - - - @@ -2015,21 +1252,13 @@ - - - - - - + + + - - - - - - @@ -2075,21 +1288,13 @@ - - - - - - + + + - - - - - - @@ -2139,21 +1328,13 @@ - - - - - - + + + - - - - - - @@ -2203,21 +1368,13 @@ - - - - - - + + + - - - - - - @@ -2263,21 +1404,13 @@ - - - - - - + + + - - - - - - @@ -2323,21 +1440,13 @@ - - - - - - + + + - - - - - - @@ -2383,21 +1476,13 @@ - - - - - - + + + - - - - - - @@ -2443,21 +1512,13 @@ - - - - - - + + + - - - - - - @@ -2507,21 +1552,13 @@ - - - - - - + + + - - - - - - @@ -2567,21 +1588,13 @@ - - - - - - + + + - - - - - - @@ -2627,21 +1624,13 @@ - - - - - - + + + - - - - - - @@ -2687,21 +1660,13 @@ - - - - - - + + + - - - - - - @@ -2747,21 +1696,13 @@ - - - - - - + + + - - - - - - @@ -2807,21 +1732,13 @@ - - - - - - + + + - - - - - - @@ -2867,21 +1768,13 @@ - - - - - - + + + - - - - - - @@ -2930,21 +1807,13 @@ - - - - - - + + + - - - - - - @@ -2990,21 +1843,13 @@ - - - - - - + + + - - - - - - @@ -3050,21 +1879,13 @@ - - - - - - + + + - - - - - - @@ -3110,21 +1915,13 @@ - - - - - - + + + - - - - - - @@ -3174,21 +1955,13 @@ - - - - - - + + + - - - - - - @@ -3238,21 +1995,13 @@ - - - - - - + + + - - - - - - @@ -3298,21 +2031,13 @@ - - - - - - + + + - - - - - - @@ -3358,21 +2067,13 @@ - - - - - - + + + - - - - - - @@ -3422,21 +2107,13 @@ - - - - - - + + + - - - - - - @@ -3490,21 +2151,13 @@ - - - - - - + + + - - - - - - @@ -3562,21 +2199,13 @@ - - - - - - + + + - - - - - - @@ -3630,21 +2243,13 @@ - - - - - - + + + - - - - - - @@ -3694,21 +2283,13 @@ - - - - - - + + + - - - - - - @@ -3766,21 +2331,13 @@ - - - - - - + + + - - - - - - @@ -3846,21 +2387,13 @@ - - - - - - + + + - - - - - - @@ -3914,21 +2431,13 @@ - - - - - - + + + - - - - - - @@ -3982,21 +2475,13 @@ - - - - - - + + + - - - - - - @@ -4050,21 +2519,13 @@ - - - - - - + + + - - - - - - @@ -4110,21 +2555,13 @@ - - - - - - + + + - - - - - - @@ -4174,21 +2595,13 @@ - - - - - - + + + - - - - - - @@ -4242,21 +2639,13 @@ - - - - - - + + + - - - - - - @@ -4310,21 +2683,13 @@ - - - - - - + + + + + + + + + Index: /trunk/ab5.0/abdev/ProjectEditor/RadProc.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/RadProc.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/RadProc.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/RadSupport.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/RadSupport.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/RadSupport.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/RadToolsAndPropertyProc.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/RadToolsAndPropertyProc.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/RadToolsAndPropertyProc.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "Common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/Rad_UndoRedo.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/Rad_UndoRedo.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/Rad_UndoRedo.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "Common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/Replace.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/Replace.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/Replace.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/Resource.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/Resource.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/Resource.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/Ruler.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/Ruler.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/Ruler.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/Search.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/Search.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/Search.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/StringCount.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/StringCount.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/StringCount.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" @@ -97,2 +99,3 @@ #endif //THETEXT + Index: /trunk/ab5.0/abdev/ProjectEditor/SubOperation.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/SubOperation.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/SubOperation.cpp (revision 475) @@ -1,4 +1,7 @@ +#include "stdafx.h" + #include "Common.h" +using namespace ActiveBasic::IDE; void ScreenToClient(HWND hwnd,RECT *pRect){ @@ -908,20 +911,14 @@ //リソース用DLLをマッピング -#if defined(JPN) - //日本語リソース - sprintf(temporary,"%sSubOperation\\res.dll",pj_editor_Dir); -#else - //英語リソース - sprintf(temporary,"%sSubOperation\\res_e.dll",pj_editor_Dir); -#endif - hResInst=LoadLibrary(temporary); + const std::string resDllPath = Program::GetApplicationSystemDirPath() + "\\res.dll"; + hResInst = LoadLibrary( resDllPath.c_str() ); //アイコンリソースDLLをマッピング - sprintf(temporary,"%sSubOperation\\icon_res.dll",pj_editor_Dir); - hIconResInst=LoadLibrary(temporary); + const std::string iconResDllPath = Program::GetApplicationSystemDirPath() + "\\icon_res.dll"; + hIconResInst = LoadLibrary( iconResDllPath.c_str() ); //LuxCtrl.dllをマッピング - sprintf(temporary,"%sSubOperation\\LuxCtrl.dll",pj_editor_Dir); - hLib_LuxCtrl=LoadLibrary(temporary); + const std::string luxCtrlDllPath = Program::GetApplicationSystemDirPath() + "\\LuxCtrl.dll"; + hLib_LuxCtrl = LoadLibrary( luxCtrlDllPath.c_str() ); if(!hLib_LuxCtrl){ MessageBox(0,"LuxCtrl.dllの読み込みに失敗しました。",APPLICATION_NAME,MB_OK|MB_ICONEXCLAMATION); @@ -1223,6 +1220,6 @@ HANDLE hFile; DWORD dw; - sprintf(temporary,"%sSubOperation\\8bit.plt",pj_editor_Dir); - hFile=CreateFile(temporary,GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL); + const std::string pltPath = Program::GetApplicationSystemDirPath() + "\\8bit.plt"; + hFile=CreateFile(pltPath.c_str(),GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL); if(hFile==INVALID_HANDLE_VALUE){ //"\"%s\" ファイルの読み込みに失敗しました。" Index: /trunk/ab5.0/abdev/ProjectEditor/TabCtrl.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/TabCtrl.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/TabCtrl.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "Common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/TextEditor.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/TextEditor.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/TextEditor.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "Common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/TextEditor_EventProc.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/TextEditor_EventProc.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/TextEditor_EventProc.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "Common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/TextEditor_ImeEvent.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/TextEditor_ImeEvent.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/TextEditor_ImeEvent.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/TextEditor_KeyEvent.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/TextEditor_KeyEvent.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/TextEditor_KeyEvent.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" #include "HtmlAnalysis.h" Index: /trunk/ab5.0/abdev/ProjectEditor/TextEditor_MouseEvent.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/TextEditor_MouseEvent.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/TextEditor_MouseEvent.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/TextEditor_UndoRedo.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/TextEditor_UndoRedo.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/TextEditor_UndoRedo.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/WebSearch.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/WebSearch.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/WebSearch.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" #include "CIEsink.h" Index: /trunk/ab5.0/abdev/ProjectEditor/WindowControl.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/WindowControl.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/WindowControl.cpp (revision 475) @@ -1,3 +1,7 @@ +#include "stdafx.h" + #include "Common.h" + +using namespace ActiveBasic::IDE; #if defined(JPN) @@ -2255,12 +2259,6 @@ //テンプレートを読み込む -#if defined(JPN) - //日本語ファイル - sprintf(temporary,"%sSubOperation\\new_window_template.sbp",pj_editor_Dir); -#else - //英語ファイル - sprintf(temporary,"%sSubOperation\\new_window_template_e.sbp",pj_editor_Dir); -#endif - pTemp=ReadBuffer(temporary); + const std::string newWindowTemplateSbpPath = Program::GetApplicationSystemDirPath() + "\\new_window_template.sbp"; + pTemp = ReadBuffer( newWindowTemplateSbpPath ); //#name#をプロジェクト名に置換 Index: /trunk/ab5.0/abdev/ProjectEditor/analysis.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/analysis.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/analysis.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/include/Program.h =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/include/Program.h (revision 475) +++ /trunk/ab5.0/abdev/ProjectEditor/include/Program.h (revision 475) @@ -0,0 +1,16 @@ +#pragma once + +namespace ActiveBasic{ namespace IDE{ + + +class Program +{ +public: + static const std::string GetApplicationSystemDirPath() + { + return Jenga::Common::Environment::GetAppDir() + "\\system"; + } +}; + + +}} Index: /trunk/ab5.0/abdev/ProjectEditor/menu.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/menu.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/menu.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/nkf_class.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/nkf_class.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/nkf_class.cpp (revision 475) @@ -1,12 +1,15 @@ +#include "stdafx.h" + #include "common.h" + +using namespace ActiveBasic::IDE; //文字コード変換用クラスライブラリ CNkf nkf; -CNkf::CNkf(){ - char temporary[MAX_PATH]; - sprintf(temporary,"%sSubOperation\\nkf32.dll",pj_editor_Dir); - - hLib=LoadLibrary(temporary); +CNkf::CNkf() +{ + const std::string nkf32DllPath = Program::GetApplicationSystemDirPath() + "\\system\\nkf32.dll"; + hLib = LoadLibrary( nkf32DllPath.c_str() ); pGetNkfVersion=(GetNkfVersion)GetProcAddress(hLib,"GetNkfVersion"); Index: /trunk/ab5.0/abdev/ProjectEditor/rebar.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/rebar.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/rebar.cpp (revision 475) @@ -1,2 +1,4 @@ +#include "stdafx.h" + #include "Common.h" Index: /trunk/ab5.0/abdev/ProjectEditor/reg_exp.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/reg_exp.cpp (revision 474) +++ /trunk/ab5.0/abdev/ProjectEditor/reg_exp.cpp (revision 475) @@ -1,11 +1,14 @@ +#include "stdafx.h" + #include "common.h" + +using namespace ActiveBasic::IDE; CRegExp obj_RegExp; -CRegExp::CRegExp(){ - char temporary[MAX_PATH]; - sprintf(temporary,"%sSubOperation\\BREGEXP.DLL",pj_editor_Dir); - - hLib=LoadLibrary(temporary); +CRegExp::CRegExp() +{ + const std::string bregexpDllPath = Program::GetApplicationSystemDirPath() + "\\system\\BREGEXP.dll"; + hLib = LoadLibrary( bregexpDllPath.c_str() ); BMatch=(PFUNC_BMatch)GetProcAddress(hLib,"BMatch"); @@ -34,8 +37,8 @@ else sprintf(pTemp,"m/(%s)/",exp); - //Shift-JISで表現 + //Shift-JISﾅ表 lstrcat(pTemp,"k"); - //大文字・小文字 + //蝠ｶE if(!IsBigSmall) lstrcat(pTemp,"i"); @@ -78,8 +81,8 @@ else sprintf(pTemp,"s/%s/%s/",exp,szPermu); - //Shift-JISで表現 + //Shift-JISﾅ表 lstrcat(pTemp,"k"); - //大文字・小文字 + //蝠ｶE if(!IsBigSmall) lstrcat(pTemp,"i"); Index: /trunk/ab5.0/abdev/ProjectEditor/stdafx.cpp =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/stdafx.cpp (revision 475) +++ /trunk/ab5.0/abdev/ProjectEditor/stdafx.cpp (revision 475) @@ -0,0 +1,1 @@ +#include "stdafx.h" Index: /trunk/ab5.0/abdev/ProjectEditor/stdafx.h =================================================================== --- /trunk/ab5.0/abdev/ProjectEditor/stdafx.h (revision 475) +++ /trunk/ab5.0/abdev/ProjectEditor/stdafx.h (revision 475) @@ -0,0 +1,30 @@ +#pragma once + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +//boost libraries +#include + +#include +#include +#include +#include +#include + +#include Index: /trunk/ab5.0/abdev/ab_common/Environment.h =================================================================== --- /trunk/ab5.0/abdev/ab_common/Environment.h (revision 475) +++ /trunk/ab5.0/abdev/ab_common/Environment.h (revision 475) @@ -0,0 +1,15 @@ +#pragma once + +namespace ActiveBasic{ namespace Common{ + + +class Environment +{ +public: + static const std::string GetAbdevRootPath(); + static const std::string GetX86CompilerExePath(); + static const std::string GetX64CompilerExePath(); +}; + + +}} Index: /trunk/ab5.0/abdev/ab_common/ab_common.vcproj =================================================================== --- /trunk/ab5.0/abdev/ab_common/ab_common.vcproj (revision 475) +++ /trunk/ab5.0/abdev/ab_common/ab_common.vcproj (revision 475) @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: /trunk/ab5.0/abdev/ab_common/stdafx.cpp =================================================================== --- /trunk/ab5.0/abdev/ab_common/stdafx.cpp (revision 475) +++ /trunk/ab5.0/abdev/ab_common/stdafx.cpp (revision 475) @@ -0,0 +1,1 @@ +#include "stdafx.h" Index: /trunk/ab5.0/abdev/ab_common/stdafx.h =================================================================== --- /trunk/ab5.0/abdev/ab_common/stdafx.h (revision 475) +++ /trunk/ab5.0/abdev/ab_common/stdafx.h (revision 475) @@ -0,0 +1,29 @@ +#pragma once + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +//boost libraries +#include + +#include +#include +#include +#include + +#include "Environment.h" Index: /trunk/ab5.0/abdev/abcompiler32.sln =================================================================== --- /trunk/ab5.0/abdev/abcompiler32.sln (revision 474) +++ /trunk/ab5.0/abdev/abcompiler32.sln (revision 475) @@ -1,7 +1,5 @@  Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "..\jenga\projects\common\common.vcproj", "{F01805B6-65B4-4708-88F4-A5E07DEA9FBD}" -EndProject +# Visual C++ Express 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BasicCompiler32", "BasicCompiler32\BasicCompiler.vcproj", "{11F0E9AB-EAEC-4616-A9DD-838073342CBB}" ProjectSection(ProjectDependencies) = postProject @@ -11,43 +9,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ProjectEditor", "ProjectEditor\ProjectEditor.vcproj", "{DC1B787E-510F-4F7D-8F9A-182600904D83}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jenga", "..\jenga\projects\jenga\jenga.vcproj", "{F01805B6-65B4-4708-88F4-A5E07DEA9FBD}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ab_common", "ab_common\ab_common.vcproj", "{87835C33-64C9-4BA5-9B39-608BA5394387}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - AB_Debug|Win32 = AB_Debug|Win32 - AB_Release|Win32 = AB_Release|Win32 Debug|Win32 = Debug|Win32 - English_Rel|Win32 = English_Rel|Win32 Release|Win32 = Release|Win32 TheText_Debug|Win32 = TheText_Debug|Win32 TheText_Release|Win32 = TheText_Release|Win32 - TheText_Share_Debug|Win32 = TheText_Share_Debug|Win32 - TheText_Share_Release|Win32 = TheText_Share_Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.AB_Debug|Win32.ActiveCfg = Release(x86)|Win32 - {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.AB_Debug|Win32.Build.0 = Release(x86)|Win32 - {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.AB_Release|Win32.ActiveCfg = Release(x86)|Win32 - {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.AB_Release|Win32.Build.0 = Release(x86)|Win32 - {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Debug|Win32.ActiveCfg = Debug(x86)|Win32 - {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Debug|Win32.Build.0 = Debug(x86)|Win32 - {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.English_Rel|Win32.ActiveCfg = Release(x86)|Win32 - {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.English_Rel|Win32.Build.0 = Release(x86)|Win32 - {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Release|Win32.ActiveCfg = Release(x86)|Win32 - {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Release|Win32.Build.0 = Release(x86)|Win32 - {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.TheText_Debug|Win32.ActiveCfg = Release(x86)|Win32 - {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.TheText_Debug|Win32.Build.0 = Release(x86)|Win32 - {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.TheText_Release|Win32.ActiveCfg = Release(x86)|Win32 - {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.TheText_Release|Win32.Build.0 = Release(x86)|Win32 - {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.TheText_Share_Debug|Win32.ActiveCfg = Release(x86)|Win32 - {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.TheText_Share_Debug|Win32.Build.0 = Release(x86)|Win32 - {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.TheText_Share_Release|Win32.ActiveCfg = Release(x86)|Win32 - {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.TheText_Share_Release|Win32.Build.0 = Release(x86)|Win32 - {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.AB_Debug|Win32.ActiveCfg = Debug|Win32 - {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.AB_Debug|Win32.Build.0 = Debug|Win32 - {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.AB_Release|Win32.ActiveCfg = Release|Win32 - {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.AB_Release|Win32.Build.0 = Release|Win32 {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Debug|Win32.ActiveCfg = Debug|Win32 {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Debug|Win32.Build.0 = Debug|Win32 - {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.English_Rel|Win32.ActiveCfg = Release|Win32 - {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.English_Rel|Win32.Build.0 = Release|Win32 {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Release|Win32.ActiveCfg = Release|Win32 {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Release|Win32.Build.0 = Release|Win32 @@ -56,26 +29,28 @@ {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.TheText_Release|Win32.ActiveCfg = Release|Win32 {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.TheText_Release|Win32.Build.0 = Release|Win32 - {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.TheText_Share_Debug|Win32.ActiveCfg = Debug|Win32 - {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.TheText_Share_Debug|Win32.Build.0 = Debug|Win32 - {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.TheText_Share_Release|Win32.ActiveCfg = Release|Win32 - {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.TheText_Share_Release|Win32.Build.0 = Release|Win32 - {DC1B787E-510F-4F7D-8F9A-182600904D83}.AB_Debug|Win32.ActiveCfg = AB_Debug|Win32 - {DC1B787E-510F-4F7D-8F9A-182600904D83}.AB_Debug|Win32.Build.0 = AB_Debug|Win32 - {DC1B787E-510F-4F7D-8F9A-182600904D83}.AB_Release|Win32.ActiveCfg = AB_Release|Win32 - {DC1B787E-510F-4F7D-8F9A-182600904D83}.AB_Release|Win32.Build.0 = AB_Release|Win32 - {DC1B787E-510F-4F7D-8F9A-182600904D83}.Debug|Win32.ActiveCfg = TheText_Debug|Win32 - {DC1B787E-510F-4F7D-8F9A-182600904D83}.Debug|Win32.Build.0 = TheText_Debug|Win32 - {DC1B787E-510F-4F7D-8F9A-182600904D83}.English_Rel|Win32.ActiveCfg = English_Rel|Win32 - {DC1B787E-510F-4F7D-8F9A-182600904D83}.English_Rel|Win32.Build.0 = English_Rel|Win32 - {DC1B787E-510F-4F7D-8F9A-182600904D83}.Release|Win32.ActiveCfg = AB_Release|Win32 - {DC1B787E-510F-4F7D-8F9A-182600904D83}.Release|Win32.Build.0 = AB_Release|Win32 + {DC1B787E-510F-4F7D-8F9A-182600904D83}.Debug|Win32.ActiveCfg = Debug|Win32 + {DC1B787E-510F-4F7D-8F9A-182600904D83}.Debug|Win32.Build.0 = Debug|Win32 + {DC1B787E-510F-4F7D-8F9A-182600904D83}.Release|Win32.ActiveCfg = Release|Win32 + {DC1B787E-510F-4F7D-8F9A-182600904D83}.Release|Win32.Build.0 = Release|Win32 {DC1B787E-510F-4F7D-8F9A-182600904D83}.TheText_Debug|Win32.ActiveCfg = TheText_Debug|Win32 {DC1B787E-510F-4F7D-8F9A-182600904D83}.TheText_Debug|Win32.Build.0 = TheText_Debug|Win32 {DC1B787E-510F-4F7D-8F9A-182600904D83}.TheText_Release|Win32.ActiveCfg = TheText_Release|Win32 {DC1B787E-510F-4F7D-8F9A-182600904D83}.TheText_Release|Win32.Build.0 = TheText_Release|Win32 - {DC1B787E-510F-4F7D-8F9A-182600904D83}.TheText_Share_Debug|Win32.ActiveCfg = TheText_Share_Debug|Win32 - {DC1B787E-510F-4F7D-8F9A-182600904D83}.TheText_Share_Debug|Win32.Build.0 = TheText_Share_Debug|Win32 - {DC1B787E-510F-4F7D-8F9A-182600904D83}.TheText_Share_Release|Win32.ActiveCfg = TheText_Share_Release|Win32 - {DC1B787E-510F-4F7D-8F9A-182600904D83}.TheText_Share_Release|Win32.Build.0 = TheText_Share_Release|Win32 + {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Debug|Win32.ActiveCfg = Debug(x86)|Win32 + {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Debug|Win32.Build.0 = Debug(x86)|Win32 + {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Release|Win32.ActiveCfg = Release(x86)|Win32 + {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Release|Win32.Build.0 = Release(x86)|Win32 + {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.TheText_Debug|Win32.ActiveCfg = Debug(x86)|Win32 + {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.TheText_Debug|Win32.Build.0 = Debug(x86)|Win32 + {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.TheText_Release|Win32.ActiveCfg = Release(x86)|Win32 + {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.TheText_Release|Win32.Build.0 = Release(x86)|Win32 + {87835C33-64C9-4BA5-9B39-608BA5394387}.Debug|Win32.ActiveCfg = Debug|Win32 + {87835C33-64C9-4BA5-9B39-608BA5394387}.Debug|Win32.Build.0 = Debug|Win32 + {87835C33-64C9-4BA5-9B39-608BA5394387}.Release|Win32.ActiveCfg = Release|Win32 + {87835C33-64C9-4BA5-9B39-608BA5394387}.Release|Win32.Build.0 = Release|Win32 + {87835C33-64C9-4BA5-9B39-608BA5394387}.TheText_Debug|Win32.ActiveCfg = Debug|Win32 + {87835C33-64C9-4BA5-9B39-608BA5394387}.TheText_Debug|Win32.Build.0 = Debug|Win32 + {87835C33-64C9-4BA5-9B39-608BA5394387}.TheText_Release|Win32.ActiveCfg = Release|Win32 + {87835C33-64C9-4BA5-9B39-608BA5394387}.TheText_Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution Index: /trunk/ab5.0/abdev/abcompiler64.sln =================================================================== --- /trunk/ab5.0/abdev/abcompiler64.sln (revision 474) +++ /trunk/ab5.0/abdev/abcompiler64.sln (revision 475) @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 +# Visual C++ Express 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BasicCompiler", "BasicCompiler64\BasicCompiler.vcproj", "{864B921B-423B-4F9E-9E6B-31B15968EDF9}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "..\jenga\projects\common\common.vcproj", "{F01805B6-65B4-4708-88F4-A5E07DEA9FBD}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jenga", "..\jenga\projects\jenga\jenga.vcproj", "{F01805B6-65B4-4708-88F4-A5E07DEA9FBD}" EndProject Global