Changeset 806 in dev


Ignore:
Timestamp:
Feb 12, 2011, 2:32:22 AM (13 years ago)
Author:
イグトランス (egtra)
Message:

コンパイラのstdafx.h, .cppを32/64ビットで共通化。Windows SDKに含まれるライブラリ・ヘッダの除去。VC++ 2010 Express with WDKのATL環境で_SECURE_ATLがエラーを起こす問題の修正。4996警告の抑制pragmaを削除。ほか。

Location:
branches/egtra/ab5.0
Files:
6 deleted
14 edited
2 moved

Legend:

Unmodified
Added
Removed

  • branches/egtra/ab5.0/abdev/BasicCompiler_Common/BasicCompiler.cpp

    r801 r806  
    731731    if( program.IsClipCompileView() ){
    732732        //ProjectEditor埋め込み型インターフェイス
    733         hMainDlg=CreateDialog(hInst,MAKEINTRESOURCE(IDD_CLIPMAIN),hOwnerEditor,(DLGPROC)DlgCompile);
     733        hMainDlg=CreateDialog(hInst, MAKEINTRESOURCE(IDD_CLIPMAIN), hOwnerEditor, DlgCompile);
    734734        ShowWindow(hMainDlg,SW_SHOW);
    735735        SendMessage(hOwnerEditor,WM_SETCOMPILEVIEW,0,(LPARAM)hMainDlg);
    … …  
    773773
    774774    //エラーリストをサブクラス化
    775     OldErrorListProc=(WNDPROC)GetWindowLongPtr(GetDlgItem(hMainDlg,IDC_ERRORLIST),GWLP_WNDPROC);
    776     SetWindowLongPtr(GetDlgItem(hMainDlg,IDC_ERRORLIST),GWLP_WNDPROC,(LONG_PTR)ErrorListProc);
     775    OldErrorListProc = reinterpret_cast<WNDPROC>(SetWindowLongPtr(GetDlgItem(hMainDlg, IDC_ERRORLIST), GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(ErrorListProc)));
    777776
    778777    //デバッグリストをサブクラス化
    779     OldDebugListProc=(WNDPROC)GetWindowLongPtr(GetDlgItem(hMainDlg,IDC_DEBUGLIST),GWLP_WNDPROC);
    780     SetWindowLongPtr(GetDlgItem(hMainDlg,IDC_DEBUGLIST),GWLP_WNDPROC,(LONG_PTR)DebugListProc);
     778    OldDebugListProc = reinterpret_cast<WNDPROC>(SetWindowLongPtr(GetDlgItem(hMainDlg, IDC_DEBUGLIST), GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(DebugListProc)));
    781779
    782780    if( program.IsKickedFromEditor() )

  • branches/egtra/ab5.0/abdev/BasicCompiler_Common/common.h

    r764 r806  
    11#pragma once
    22
    3 //#define _CRT_SECURE_NO_DEPRECATE
    4 #pragma warning(disable : 4996)
     3
     4#include <psapi.h>
    55
    66#include <option.h>
    … …  
    1717
    1818#include "../BasicCompiler_Common/NonVolatile.h"
    19 #include "../BasicCompiler_Common/psapi.h"
    2019
    2120
    … …  
    4241    #define PLATFORM    64
    4342#else
    44 #define PLATFORM    32
    45     #ifndef LONG_PTR
    46         typedef long LONG_PTR;
    47         typedef DWORD ULONG_PTR;
    48     #endif
     43    #define PLATFORM    32
    4944#endif
    5045
    … …  
    221216
    222217//hash.cpp
    223 int hash_default(const char *name);
    224218DllProc *GetDeclareHash(const char *name);
    225219void GetOverloadSubHash( const char *lpszName, std::vector<const UserProc *> &subs );

  • branches/egtra/ab5.0/abdev/BasicCompiler_Common/hash.cpp

    r803 r806  
    1212
    1313using namespace ActiveBasic::Compiler;
    14 
    15 int hash_default(const char *name){
    16     int key;
    17 
    18     for(key=0;*name!='\0';name++){
    19         key=((key<<8)+ *name )%MAX_HASH;
    20     }
    21 
    22     return key;
    23 }
    2414
    2515DllProc *GetDeclareHash(const char *fullName){

  • branches/egtra/ab5.0/abdev/BasicCompiler_Common/src/BoostSerializationSupport.cpp

    r776 r806  
    1 #pragma warning(disable : 4996)
    2 
    31#include <map>
    42#include <string>

  • branches/egtra/ab5.0/abdev/ab-common-64.props

    r803 r806  
    66  <ItemDefinitionGroup>
    77    <ClCompile>
    8       <PreprocessorDefinitions>WINVER=0x0501;_WIN32_WINNT=0x0501;;_WIN32_IE=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     8      <PreprocessorDefinitions>WINVER=0x0501;_WIN32_WINNT=0x0501;_WIN32_IE=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    99    </ClCompile>
    1010    <Link>

  • branches/egtra/ab5.0/abdev/ab-common.props

    r803 r806  
    2020      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    2121      <ExceptionHandling>Async</ExceptionHandling>
    22       <PreprocessorDefinitions>WIN32;_SECURE_ATL=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     22      <PreprocessorDefinitions>WIN32;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_MEMORY=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    2323      <AdditionalOptions>/Zm150 %(AdditionalOptions)</AdditionalOptions>
    2424    </ClCompile>

  • branches/egtra/ab5.0/abdev/ab_common/ab_common.vcxproj

    r798 r806  
    148148      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    149149      </PrecompiledHeader>
     150      <EnablePREfast Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</EnablePREfast>
     151      <EnablePREfast Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</EnablePREfast>
    150152    </ClCompile>
    151153    <ClCompile Include="src\OSVersion.cpp" />

  • branches/egtra/ab5.0/abdev/ab_common/src/Lexical/ObjectModule.cpp

    r776 r806  
    1 #pragma warning(disable : 4996)
     1//#pragma warning(disable : 4996)
    22
    33#include <map>

  • branches/egtra/ab5.0/abdev/abdev/stdafx.h

    r804 r806  
    11#pragma once
    2 #define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 1
    32
    43#include <map>
    … …  
    2625#include <atlcom.h>
    2726#include <atlhost.h>
     27#undef _SECURE_ATL
     28#define _SECURE_ATL 1
    2829#pragma warning(push)
    2930#pragma warning(disable: 6011 6246 6255 6269 6387)

  • branches/egtra/ab5.0/abdev/compiler.vcxproj

    r803 r806  
    321321      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
    322322    </ClCompile>
     323    <ClCompile Include="BasicCompiler_Common\stdafx.cpp">
     324      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
     325      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
     326      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
     327      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     328    </ClCompile>
    323329    <ClCompile Include="BasicCompiler_Common\StrOperation.cpp">
    324330      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
    … …  
    417423      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    418424      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
    419     </ClCompile>
    420     <ClCompile Include="compiler_x86\stdafx.cpp">
    421       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
    422       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    423       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
    424       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
    425       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    426       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
    427425    </ClCompile>
    428426    <ClCompile Include="compiler_x86\Compile_Calc.cpp">
    … …  
    627625      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
    628626    </ClCompile>
    629     <ClCompile Include="compiler_x64\stdafx.cpp">
    630       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    631       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
    632       <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
    633       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
    634       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
    635       <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
    636       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
    637       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
    638       <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
    639       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
    640       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
    641       <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
    642     </ClCompile>
    643627    <ClCompile Include="compiler_x64\Compile_Calc.cpp">
    644628      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    … …  
    851835  </ItemGroup>
    852836  <ItemGroup>
     837    <ClInclude Include="BasicCompiler_Common\stdafx.h" />
    853838    <ClInclude Include="BasicCompiler_Common\StrOperation.h" />
    854839    <ClInclude Include="BasicCompiler_Common\debug.h" />
    … …  
    884869    <ClInclude Include="compiler_x86\MachineFixed.h" />
    885870    <ClInclude Include="compiler_x86\Opcode.h" />
    886     <ClInclude Include="compiler_x86\stdafx.h" />
    887871    <ClInclude Include="compiler_x64\CommandValue.h" />
    888872    <ClInclude Include="compiler_x64\FunctionValue.h" />
    889873    <ClInclude Include="compiler_x64\MachineFixed.h" />
    890874    <ClInclude Include="compiler_x64\Opcode.h" />
    891     <ClInclude Include="compiler_x64\stdafx.h" />
    892875  </ItemGroup>
    893876  <ItemGroup>

  • branches/egtra/ab5.0/abdev/compiler.vcxproj.filters

    r801 r806  
    205205      <Filter>Source Files\x86Compiler</Filter>
    206206    </ClCompile>
    207     <ClCompile Include="compiler_x86\stdafx.cpp">
    208       <Filter>Source Files\x86Compiler</Filter>
    209     </ClCompile>
    210207    <ClCompile Include="compiler_x86\Compile_Calc.cpp">
    211208      <Filter>Source Files\x86Compiler\Calculation</Filter>
    … …  
    331328      <Filter>Source Files\x64Compiler</Filter>
    332329    </ClCompile>
    333     <ClCompile Include="compiler_x64\stdafx.cpp">
    334       <Filter>Source Files\x64Compiler</Filter>
    335     </ClCompile>
    336330    <ClCompile Include="compiler_x64\Compile_Calc.cpp">
    337331      <Filter>Source Files\x64Compiler\Calculation</Filter>
    … …  
    392386    </ClCompile>
    393387    <ClCompile Include="OldWindowsHelperImpl.cpp">
     388      <Filter>Source Files</Filter>
     389    </ClCompile>
     390    <ClCompile Include="BasicCompiler_Common\stdafx.cpp">
    394391      <Filter>Source Files</Filter>
    395392    </ClCompile>
    … …  
    495492      <Filter>Header Files\x86</Filter>
    496493    </ClInclude>
    497     <ClInclude Include="compiler_x86\stdafx.h">
    498       <Filter>Header Files\x86</Filter>
    499     </ClInclude>
    500494    <ClInclude Include="compiler_x64\CommandValue.h">
    501495      <Filter>Header Files\x64</Filter>
    … …  
    510504      <Filter>Header Files\x64</Filter>
    511505    </ClInclude>
    512     <ClInclude Include="compiler_x64\stdafx.h">
    513       <Filter>Header Files\x64</Filter>
     506    <ClInclude Include="BasicCompiler_Common\stdafx.h">
     507      <Filter>Header Files</Filter>
    514508    </ClInclude>
    515509  </ItemGroup>

  • branches/egtra/ab5.0/jenga/include/common/Environment.h

    r718 r806  
    44namespace Common{
    55
    6 #pragma warning(disable : 4996)
    76
    87class Environment

  • branches/egtra/ab5.0/jenga/include/common/File.h

    r769 r806  
    11#pragma once
    2 #pragma warning(disable : 4996)
    32
    43

  • branches/egtra/ab5.0/jenga/projects/jenga/jenga.vcxproj

    r777 r806  
    5353  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    5454    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     55    <Import Project="..\..\..\abdev\ab-common.props" />
     56    <Import Project="..\..\..\abdev\ab-common-32.props" />
    5557  </ImportGroup>
    5658  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    5759    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     60    <Import Project="..\..\..\abdev\ab-common.props" />
     61    <Import Project="..\..\..\abdev\ab-common-32.props" />
    5862  </ImportGroup>
    5963  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    6064    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     65    <Import Project="..\..\..\abdev\ab-common.props" />
     66    <Import Project="..\..\..\abdev\ab-common-64.props" />
    6167  </ImportGroup>
    6268  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    6369    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     70    <Import Project="..\..\..\abdev\ab-common.props" />
     71    <Import Project="..\..\..\abdev\ab-common-64.props" />
    6472  </ImportGroup>
    6573  <PropertyGroup Label="UserMacros" />
    … …  
    8189      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
    8290      <Optimization>Disabled</Optimization>
    83       <AdditionalIncludeDirectories>..\..\..\;..\..\..\cpplibs\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    8491      <MinimalRebuild>false</MinimalRebuild>
    8592      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    8693      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    87       <PrecompiledHeader>Use</PrecompiledHeader>
    8894      <WarningLevel>Level3</WarningLevel>
    89       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    9095    </ClCompile>
    9196    <Lib />
    … …  
    98103      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
    99104      <Optimization>Disabled</Optimization>
    100       <AdditionalIncludeDirectories>..\..\..\;..\..\..\cpplibs\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    101105      <MinimalRebuild>false</MinimalRebuild>
    102106      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    103107      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    104       <PrecompiledHeader>Use</PrecompiledHeader>
    105108      <WarningLevel>Level3</WarningLevel>
    106       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    107109    </ClCompile>
    108110    <Lib />
    … …  
    111113    <ClCompile>
    112114      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
    113       <AdditionalIncludeDirectories>..\..\..\;..\..\..\cpplibs\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    114115      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    115       <PrecompiledHeader>Use</PrecompiledHeader>
    116116      <WarningLevel>Level3</WarningLevel>
    117       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    118117    </ClCompile>
    119118    <Lib />
    … …  
    125124    <ClCompile>
    126125      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
    127       <AdditionalIncludeDirectories>..\..\..\;..\..\..\cpplibs\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    128126      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    129       <PrecompiledHeader>Use</PrecompiledHeader>
    130127      <WarningLevel>Level3</WarningLevel>
    131       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    132128    </ClCompile>
    133129    <Lib />
Note: See TracChangeset for help on using the changeset viewer.