Changeset 806 in dev
- Timestamp:
- Feb 12, 2011, 2:32:22 AM (14 years ago)
- 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 731 731 if( program.IsClipCompileView() ){ 732 732 //ProjectEditor埋め込み型インターフェイス 733 hMainDlg=CreateDialog(hInst, MAKEINTRESOURCE(IDD_CLIPMAIN),hOwnerEditor,(DLGPROC)DlgCompile);733 hMainDlg=CreateDialog(hInst, MAKEINTRESOURCE(IDD_CLIPMAIN), hOwnerEditor, DlgCompile); 734 734 ShowWindow(hMainDlg,SW_SHOW); 735 735 SendMessage(hOwnerEditor,WM_SETCOMPILEVIEW,0,(LPARAM)hMainDlg); … … 773 773 774 774 //エラーリストをサブクラス化 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))); 777 776 778 777 //デバッグリストをサブクラス化 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))); 781 779 782 780 if( program.IsKickedFromEditor() ) -
branches/egtra/ab5.0/abdev/BasicCompiler_Common/common.h
r764 r806 1 1 #pragma once 2 2 3 //#define _CRT_SECURE_NO_DEPRECATE 4 # pragma warning(disable : 4996)3 4 #include <psapi.h> 5 5 6 6 #include <option.h> … … 17 17 18 18 #include "../BasicCompiler_Common/NonVolatile.h" 19 #include "../BasicCompiler_Common/psapi.h"20 19 21 20 … … 42 41 #define PLATFORM 64 43 42 #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 49 44 #endif 50 45 … … 221 216 222 217 //hash.cpp 223 int hash_default(const char *name);224 218 DllProc *GetDeclareHash(const char *name); 225 219 void GetOverloadSubHash( const char *lpszName, std::vector<const UserProc *> &subs ); -
branches/egtra/ab5.0/abdev/BasicCompiler_Common/hash.cpp
r803 r806 12 12 13 13 using 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 }24 14 25 15 DllProc *GetDeclareHash(const char *fullName){ -
branches/egtra/ab5.0/abdev/BasicCompiler_Common/src/BoostSerializationSupport.cpp
r776 r806 1 #pragma warning(disable : 4996)2 3 1 #include <map> 4 2 #include <string> -
branches/egtra/ab5.0/abdev/ab-common-64.props
r803 r806 6 6 <ItemDefinitionGroup> 7 7 <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> 9 9 </ClCompile> 10 10 <Link> -
branches/egtra/ab5.0/abdev/ab-common.props
r803 r806 20 20 <MultiProcessorCompilation>true</MultiProcessorCompilation> 21 21 <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> 23 23 <AdditionalOptions>/Zm150 %(AdditionalOptions)</AdditionalOptions> 24 24 </ClCompile> -
branches/egtra/ab5.0/abdev/ab_common/ab_common.vcxproj
r798 r806 148 148 <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 149 149 </PrecompiledHeader> 150 <EnablePREfast Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</EnablePREfast> 151 <EnablePREfast Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</EnablePREfast> 150 152 </ClCompile> 151 153 <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) 2 2 3 3 #include <map> -
branches/egtra/ab5.0/abdev/abdev/stdafx.h
r804 r806 1 1 #pragma once 2 #define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 13 2 4 3 #include <map> … … 26 25 #include <atlcom.h> 27 26 #include <atlhost.h> 27 #undef _SECURE_ATL 28 #define _SECURE_ATL 1 28 29 #pragma warning(push) 29 30 #pragma warning(disable: 6011 6246 6255 6269 6387) -
branches/egtra/ab5.0/abdev/compiler.vcxproj
r803 r806 321 321 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> 322 322 </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> 323 329 <ClCompile Include="BasicCompiler_Common\StrOperation.cpp"> 324 330 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> … … 417 423 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 418 424 <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>427 425 </ClCompile> 428 426 <ClCompile Include="compiler_x86\Compile_Calc.cpp"> … … 627 625 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 628 626 </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>643 627 <ClCompile Include="compiler_x64\Compile_Calc.cpp"> 644 628 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> … … 851 835 </ItemGroup> 852 836 <ItemGroup> 837 <ClInclude Include="BasicCompiler_Common\stdafx.h" /> 853 838 <ClInclude Include="BasicCompiler_Common\StrOperation.h" /> 854 839 <ClInclude Include="BasicCompiler_Common\debug.h" /> … … 884 869 <ClInclude Include="compiler_x86\MachineFixed.h" /> 885 870 <ClInclude Include="compiler_x86\Opcode.h" /> 886 <ClInclude Include="compiler_x86\stdafx.h" />887 871 <ClInclude Include="compiler_x64\CommandValue.h" /> 888 872 <ClInclude Include="compiler_x64\FunctionValue.h" /> 889 873 <ClInclude Include="compiler_x64\MachineFixed.h" /> 890 874 <ClInclude Include="compiler_x64\Opcode.h" /> 891 <ClInclude Include="compiler_x64\stdafx.h" />892 875 </ItemGroup> 893 876 <ItemGroup> -
branches/egtra/ab5.0/abdev/compiler.vcxproj.filters
r801 r806 205 205 <Filter>Source Files\x86Compiler</Filter> 206 206 </ClCompile> 207 <ClCompile Include="compiler_x86\stdafx.cpp">208 <Filter>Source Files\x86Compiler</Filter>209 </ClCompile>210 207 <ClCompile Include="compiler_x86\Compile_Calc.cpp"> 211 208 <Filter>Source Files\x86Compiler\Calculation</Filter> … … 331 328 <Filter>Source Files\x64Compiler</Filter> 332 329 </ClCompile> 333 <ClCompile Include="compiler_x64\stdafx.cpp">334 <Filter>Source Files\x64Compiler</Filter>335 </ClCompile>336 330 <ClCompile Include="compiler_x64\Compile_Calc.cpp"> 337 331 <Filter>Source Files\x64Compiler\Calculation</Filter> … … 392 386 </ClCompile> 393 387 <ClCompile Include="OldWindowsHelperImpl.cpp"> 388 <Filter>Source Files</Filter> 389 </ClCompile> 390 <ClCompile Include="BasicCompiler_Common\stdafx.cpp"> 394 391 <Filter>Source Files</Filter> 395 392 </ClCompile> … … 495 492 <Filter>Header Files\x86</Filter> 496 493 </ClInclude> 497 <ClInclude Include="compiler_x86\stdafx.h">498 <Filter>Header Files\x86</Filter>499 </ClInclude>500 494 <ClInclude Include="compiler_x64\CommandValue.h"> 501 495 <Filter>Header Files\x64</Filter> … … 510 504 <Filter>Header Files\x64</Filter> 511 505 </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> 514 508 </ClInclude> 515 509 </ItemGroup> -
branches/egtra/ab5.0/jenga/include/common/Environment.h
r718 r806 4 4 namespace Common{ 5 5 6 #pragma warning(disable : 4996)7 6 8 7 class Environment -
branches/egtra/ab5.0/jenga/include/common/File.h
r769 r806 1 1 #pragma once 2 #pragma warning(disable : 4996)3 2 4 3 -
branches/egtra/ab5.0/jenga/projects/jenga/jenga.vcxproj
r777 r806 53 53 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> 54 54 <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" /> 55 57 </ImportGroup> 56 58 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> 57 59 <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" /> 58 62 </ImportGroup> 59 63 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> 60 64 <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" /> 61 67 </ImportGroup> 62 68 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> 63 69 <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" /> 64 72 </ImportGroup> 65 73 <PropertyGroup Label="UserMacros" /> … … 81 89 <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> 82 90 <Optimization>Disabled</Optimization> 83 <AdditionalIncludeDirectories>..\..\..\;..\..\..\cpplibs\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>84 91 <MinimalRebuild>false</MinimalRebuild> 85 92 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> 86 93 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> 87 <PrecompiledHeader>Use</PrecompiledHeader>88 94 <WarningLevel>Level3</WarningLevel> 89 <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>90 95 </ClCompile> 91 96 <Lib /> … … 98 103 <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> 99 104 <Optimization>Disabled</Optimization> 100 <AdditionalIncludeDirectories>..\..\..\;..\..\..\cpplibs\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>101 105 <MinimalRebuild>false</MinimalRebuild> 102 106 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> 103 107 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> 104 <PrecompiledHeader>Use</PrecompiledHeader>105 108 <WarningLevel>Level3</WarningLevel> 106 <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>107 109 </ClCompile> 108 110 <Lib /> … … 111 113 <ClCompile> 112 114 <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> 113 <AdditionalIncludeDirectories>..\..\..\;..\..\..\cpplibs\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>114 115 <RuntimeLibrary>MultiThreaded</RuntimeLibrary> 115 <PrecompiledHeader>Use</PrecompiledHeader>116 116 <WarningLevel>Level3</WarningLevel> 117 <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>118 117 </ClCompile> 119 118 <Lib /> … … 125 124 <ClCompile> 126 125 <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> 127 <AdditionalIncludeDirectories>..\..\..\;..\..\..\cpplibs\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>128 126 <RuntimeLibrary>MultiThreaded</RuntimeLibrary> 129 <PrecompiledHeader>Use</PrecompiledHeader>130 127 <WarningLevel>Level3</WarningLevel> 131 <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>132 128 </ClCompile> 133 129 <Lib />
Note:
See TracChangeset
for help on using the changeset viewer.