Changeset 480 in dev for trunk/ab5.0/abdev/ProjectEditor


Ignore:
Timestamp:
Apr 6, 2008, 10:03:28 PM (16 years ago)
Author:
dai_9181
Message:

構成管理を大幅に改良。

Location:
trunk/ab5.0
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/ab5.0

    • Property svn:externals

      •  

        old new  
        44abdev/build/debug/system http://dev.activebasic.com/svnroot/ablib/trunk/ab5.0/system
        55abdev/build/debug/theme http://dev.activebasic.com/svnroot/ablib/trunk/ab5.0/theme
        6 abdev/build/release/ablib http://dev.activebasic.com/svnroot/ablib/trunk/ab5.0/ablib
        7 abdev/build/release/runtime http://dev.activebasic.com/svnroot/ablib/trunk/ab5.0/runtime
        8 abdev/build/release/system http://dev.activebasic.com/svnroot/ablib/trunk/ab5.0/system
        9 abdev/build/release/theme http://dev.activebasic.com/svnroot/ablib/trunk/ab5.0/theme
         6abdev/build/release http://dev.activebasic.com/svnroot/ablib/trunk/ab5.0

  • trunk/ab5.0/abdev/ProjectEditor/NonVolatile.cpp

    r475 r480  
    444444
    445445    //インクルードディレクトリ
    446     if(!GetStringValue("IncludeDir",szIncludeDir)) lstrcpy(szIncludeDir,"..\\Include\\");
     446    if(!GetStringValue("IncludeDir",szIncludeDir)) lstrcpy(szIncludeDir,".\\ablib\\src");
    447447
    448448    HeapDefaultFree(buffer);
    … …  
    550550
    551551    //インクルードディレクトリ
    552     lstrcpy(szIncludeDir,"..\\Include\\");
     552    lstrcpy(szIncludeDir,".\\ablib\\src");
    553553
    554554    //ウィンドウ位置、サイズ

  • trunk/ab5.0/abdev/ProjectEditor/NonVolatile.h

    r80 r480  
    103103    //インクルードディレクトリ
    104104    char szIncludeDir[MAX_PATH];
     105    std::string GetIncludeDirFullPath()
     106    {
     107        return Jenga::Common::Path::MakeFullPath( szIncludeDir, ActiveBasic::Common::Environment::GetAbdevRootPath() );
     108    }
    105109
    106110    //////////////////////////////////////////////////////////////

  • trunk/ab5.0/abdev/ProjectEditor/ProjectEditor.cpp

    r477 r480  
    20792079
    20802080                    //インクルードディレクトリ
    2081                     sprintf(temp2," /include_dir:\"%s\"",pobj_nv->szIncludeDir);
     2081                    sprintf(temp2," /include_dir:\"%s\"",pobj_nv->GetIncludeDirFullPath().c_str());
    20822082                    lstrcat(temporary,temp2);
    20832083
    … …  
    21292129
    21302130                    //インクルードディレクトリ
    2131                     sprintf(temp2," /include_dir:\"%s\"",pobj_nv->szIncludeDir);
     2131                    sprintf(temp2," /include_dir:\"%s\"",pobj_nv->GetIncludeDirFullPath().c_str());
    21322132                    lstrcat(temporary,temp2);
    21332133
    … …  
    21602160
    21612161                    //インクルードディレクトリ
    2162                     sprintf(temp2," /include_dir:\"%s\"",pobj_nv->szIncludeDir);
     2162                    sprintf(temp2," /include_dir:\"%s\"",pobj_nv->GetIncludeDirFullPath().c_str());
    21632163                    lstrcat(temporary,temp2);
    21642164
    … …  
    22242224
    22252225                    //インクルードディレクトリ
    2226                     sprintf(temp2," /include_dir:\"%s\"",pobj_nv->szIncludeDir);
     2226                    sprintf(temp2," /include_dir:\"%s\"",pobj_nv->GetIncludeDirFullPath().c_str());
    22272227                    lstrcat(temporary,temp2);
    22282228
    … …  
    22632263
    22642264                    //インクルードディレクトリ
    2265                     sprintf(temp2," /include_dir:\"%s\"",pobj_nv->szIncludeDir);
     2265                    sprintf(temp2," /include_dir:\"%s\"",pobj_nv->GetIncludeDirFullPath().c_str());
    22662266                    lstrcat(temporary,temp2);
    22672267

  • trunk/ab5.0/abdev/ProjectEditor/ProjectEditor.vcproj

    r477 r480  
    5252                AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost;.\include"
    5353                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;JPN;THETEXT;WINVER=0x0501;_WIN32_WINNT=0x0501"
    54                 StringPooling="true"
     54                StringPooling="false"
    5555                RuntimeLibrary="0"
    56                 EnableFunctionLevelLinking="true"
     56                EnableFunctionLevelLinking="false"
    5757                UsePrecompiledHeader="2"
    5858                PrecompiledHeaderFile="$(IntDir)\$(ProjectName).pch"
    … …  
    6363                WarningLevel="3"
    6464                SuppressStartupBanner="true"
     65                DebugInformationFormat="3"
    6566            />
    6667            <Tool
    … …  
    357358                WarningLevel="3"
    358359                SuppressStartupBanner="true"
    359                 DebugInformationFormat="4"
     360                DebugInformationFormat="3"
    360361            />
    361362            <Tool

  • trunk/ab5.0/abdev/ProjectEditor/SubOperation.cpp

    r477 r480  
    12601260    GetFullPath( temporary, pj_editor_Dir );
    12611261    pHeaderBuf = ReadBuffer_NonErrMsg( temporary );
    1262     if( !pHeaderBuf )
    1263     {
    1264         lstrcpy(temporary,".\\Include\\basic.sbp");
    1265         GetFullPath( temporary, pj_editor_Dir );
    1266         pHeaderBuf = ReadBuffer( temporary );
    1267         if( pHeaderBuf )
    1268         {
    1269             lstrcpy( pobj_nv->szIncludeDir, ".\\Include\\" );
    1270         }
    1271     }
    12721262
    12731263    if( !pHeaderBuf ){
Note: See TracChangeset for help on using the changeset viewer.