diff options
-rw-r--r-- | .gitignore | 4 | ||||
-rw-r--r-- | CHANGES | 6 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | autoexp.visualizer | 59 | ||||
-rw-r--r-- | src/cv2pdb.vcxproj | 122 | ||||
-rw-r--r-- | src/cv2pdb.vcxproj.filters | 61 | ||||
-rw-r--r-- | src/cv2pdb_vs12.sln | 78 | ||||
-rw-r--r-- | src/dviewhelper/dviewhelper.vcxproj | 98 | ||||
-rw-r--r-- | src/dviewhelper/dviewhelper.vcxproj.filters | 14 | ||||
-rw-r--r-- | test/Makefile | 2 | ||||
-rw-r--r-- | test/cvtest.vcxproj | 73 | ||||
-rw-r--r-- | test/cvtest.vcxproj.user | 4 |
12 files changed, 504 insertions, 19 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b2f63e8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +/bin +/src/cv2pdb_vs12.sdf +/src/cv2pdb_vs12.v12.suo +/test/obj @@ -200,3 +200,9 @@ unreleased Version 0.22 2014-03-01 Version 0.31
* added support for local variables accessed through esp
+
+2014-09-24 Version 0.32
+
+ * DWARF: fixed relocations in .debug_line section
+ * tweaked visualizer macros to display void[], limit array preview to 64 entries
+
@@ -1 +1 @@ -VERSION = 0.31
+VERSION = 0.32
diff --git a/autoexp.visualizer b/autoexp.visualizer index f5c664c..a5772f1 100644 --- a/autoexp.visualizer +++ b/autoexp.visualizer @@ -25,14 +25,38 @@ dchar[]|const(dchar)[]|immutable(dchar)[] { const void[]|void[] {
preview (
#if ($e.ptr == 0) ( "null" )
- #else (
- #( "[", $e.length, "] ", [(void*) $e.ptr] )
+ #elif($e.length > 4096) (
+ #( "[", $e.length, "] ", (void*) $e.ptr, " too large for expansion" )
+ )
+ #elif($e.length > 64) (
+ #( "[", $e.length, "]( ",
+ #array( expr:((unsigned char*)$e.ptr)[$i], size:64 ),
+ ",...)"
+ )
+ )
+ #else (
+ #(
+ "[", $e.length, "](",
+ #array ( expr : ((unsigned char*)$e.ptr)[$i], size : $e.length ),
+ ")"
+ )
)
)
children (
- #(
- length: [$e.length],
- ptr: [(void*) $e.ptr]
+ #if($e.length > 4096) (
+ #(
+ length: [$e.length],
+ ptr: [(void*) $e.ptr]
+ )
+ )
+ #else (
+ #(
+ length: [$e.length],
+ #array (
+ expr: ((unsigned char*)$e.ptr)[$i],
+ size: $e.length
+ )
+ )
)
)
}
@@ -41,19 +65,20 @@ const void[]|void[] { *[]|dArray* {
preview (
#if ($e.ptr == 0) ( "null" )
- #else (
- #if($e.length > 1024) (
- #( "[", $e.length, "] ", (void*) $e.ptr, " too large for expansion" )
+ #elif($e.length > 4096) (
+ #( "[", $e.length, "] ", (void*) $e.ptr, " too large for expansion" )
+ )
+ #elif($e.length > 64) (
+ #( "[", $e.length, "]( ",
+ #array( expr:($e.ptr)[$i], size:64 ),
+ ",...)"
)
- #else (
- #(
- "[", $e.length, "](",
- #array (
- expr : ($e.ptr)[$i],
- size : $e.length
- ),
- ")"
- )
+ )
+ #else (
+ #(
+ "[", $e.length, "](",
+ #array ( expr : ($e.ptr)[$i], size : $e.length ),
+ ")"
)
)
)
diff --git a/src/cv2pdb.vcxproj b/src/cv2pdb.vcxproj new file mode 100644 index 0000000..3694a5b --- /dev/null +++ b/src/cv2pdb.vcxproj @@ -0,0 +1,122 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{5E2BD27D-446A-4C99-9829-135F7C000D90}</ProjectGuid> + <RootNamespace>cv2pdb</RootNamespace> + <Keyword>Win32Proj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <PlatformToolset>v120_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <PlatformToolset>v120_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <OutDir>..\bin\$(Configuration)\</OutDir> + <IntDir>..\bin\$(Configuration)\$(ProjectName)\</IntDir> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <OutDir>..\bin\$(Configuration)\</OutDir> + <IntDir>..\bin\$(Configuration)\$(ProjectName)\</IntDir> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <AdditionalOptions>/wd4996 %(AdditionalOptions)</AdditionalOptions> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType> + <PrecompiledHeader /> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + </ClCompile> + <Link> + <AdditionalDependencies>dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <TargetMachine>MachineX86</TargetMachine> + <MinimumRequiredVersion>5.1</MinimumRequiredVersion> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <AdditionalOptions>/wd4996 %(AdditionalOptions)</AdditionalOptions> + <Optimization>MaxSpeed</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType> + <PrecompiledHeader /> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + <Profile>true</Profile> + <MinimumRequiredVersion>5.1</MinimumRequiredVersion> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="cv2pdb.cpp" /> + <ClCompile Include="cvutil.cpp" /> + <ClCompile Include="demangle.cpp" /> + <ClCompile Include="dwarf2pdb.cpp" /> + <ClCompile Include="main.cpp" /> + <ClCompile Include="mspdb.cpp" /> + <ClCompile Include="PEImage.cpp" /> + <ClCompile Include="symutil.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="cv2pdb.h" /> + <ClInclude Include="cvutil.h" /> + <ClInclude Include="demangle.h" /> + <ClInclude Include="LastError.h" /> + <ClInclude Include="mscvpdb.h" /> + <ClInclude Include="mspdb.h" /> + <ClInclude Include="PEImage.h" /> + <ClInclude Include="symutil.h" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/src/cv2pdb.vcxproj.filters b/src/cv2pdb.vcxproj.filters new file mode 100644 index 0000000..9807733 --- /dev/null +++ b/src/cv2pdb.vcxproj.filters @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Source Files"> + <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> + <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> + </Filter> + </ItemGroup> + <ItemGroup> + <ClCompile Include="cv2pdb.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="cvutil.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="demangle.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="dwarf2pdb.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="main.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="mspdb.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="PEImage.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="symutil.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="cv2pdb.h"> + <Filter>Source Files</Filter> + </ClInclude> + <ClInclude Include="cvutil.h"> + <Filter>Source Files</Filter> + </ClInclude> + <ClInclude Include="demangle.h"> + <Filter>Source Files</Filter> + </ClInclude> + <ClInclude Include="LastError.h"> + <Filter>Source Files</Filter> + </ClInclude> + <ClInclude Include="mscvpdb.h"> + <Filter>Source Files</Filter> + </ClInclude> + <ClInclude Include="mspdb.h"> + <Filter>Source Files</Filter> + </ClInclude> + <ClInclude Include="PEImage.h"> + <Filter>Source Files</Filter> + </ClInclude> + <ClInclude Include="symutil.h"> + <Filter>Source Files</Filter> + </ClInclude> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/src/cv2pdb_vs12.sln b/src/cv2pdb_vs12.sln new file mode 100644 index 0000000..f3e203c --- /dev/null +++ b/src/cv2pdb_vs12.sln @@ -0,0 +1,78 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.21005.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7F4A9B6A-05A2-45D0-AFC3-3754B7FB77B9}" + ProjectSection(SolutionItems) = preProject + ..\autoexp.expand = ..\autoexp.expand + ..\autoexp.visualizer = ..\autoexp.visualizer + ..\CHANGES = ..\CHANGES + ..\FEATURES = ..\FEATURES + ..\INSTALL = ..\INSTALL + ..\LICENSE = ..\LICENSE + ..\Makefile = ..\Makefile + ..\README = ..\README + ..\TODO = ..\TODO + ..\VERSION = ..\VERSION + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cv2pdb", "cv2pdb.vcxproj", "{5E2BD27D-446A-4C99-9829-135F7C000D90}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dviewhelper", "dviewhelper\dviewhelper.vcxproj", "{E4424774-A7A0-4502-8626-2723904D70EA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cvtest", "..\test\cvtest.vcxproj", "{CCC0643D-7D3F-4D5E-AE0E-C871776E86AF}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug GDC|Win32 = Debug GDC|Win32 + Debug GDC|x64 = Debug GDC|x64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + Win32 COFF|Win32 = Win32 COFF|Win32 + Win32 COFF|x64 = Win32 COFF|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5E2BD27D-446A-4C99-9829-135F7C000D90}.Debug GDC|Win32.ActiveCfg = Debug|Win32 + {5E2BD27D-446A-4C99-9829-135F7C000D90}.Debug GDC|Win32.Build.0 = Debug|Win32 + {5E2BD27D-446A-4C99-9829-135F7C000D90}.Debug GDC|x64.ActiveCfg = Debug|Win32 + {5E2BD27D-446A-4C99-9829-135F7C000D90}.Debug|Win32.ActiveCfg = Debug|Win32 + {5E2BD27D-446A-4C99-9829-135F7C000D90}.Debug|Win32.Build.0 = Debug|Win32 + {5E2BD27D-446A-4C99-9829-135F7C000D90}.Debug|x64.ActiveCfg = Debug|Win32 + {5E2BD27D-446A-4C99-9829-135F7C000D90}.Release|Win32.ActiveCfg = Release|Win32 + {5E2BD27D-446A-4C99-9829-135F7C000D90}.Release|Win32.Build.0 = Release|Win32 + {5E2BD27D-446A-4C99-9829-135F7C000D90}.Release|x64.ActiveCfg = Release|Win32 + {5E2BD27D-446A-4C99-9829-135F7C000D90}.Win32 COFF|Win32.ActiveCfg = Debug|Win32 + {5E2BD27D-446A-4C99-9829-135F7C000D90}.Win32 COFF|Win32.Build.0 = Debug|Win32 + {5E2BD27D-446A-4C99-9829-135F7C000D90}.Win32 COFF|x64.ActiveCfg = Release|Win32 + {E4424774-A7A0-4502-8626-2723904D70EA}.Debug GDC|Win32.ActiveCfg = Debug|Win32 + {E4424774-A7A0-4502-8626-2723904D70EA}.Debug GDC|Win32.Build.0 = Debug|Win32 + {E4424774-A7A0-4502-8626-2723904D70EA}.Debug GDC|x64.ActiveCfg = Debug|Win32 + {E4424774-A7A0-4502-8626-2723904D70EA}.Debug|Win32.ActiveCfg = Debug|Win32 + {E4424774-A7A0-4502-8626-2723904D70EA}.Debug|Win32.Build.0 = Debug|Win32 + {E4424774-A7A0-4502-8626-2723904D70EA}.Debug|x64.ActiveCfg = Debug|Win32 + {E4424774-A7A0-4502-8626-2723904D70EA}.Release|Win32.ActiveCfg = Release|Win32 + {E4424774-A7A0-4502-8626-2723904D70EA}.Release|Win32.Build.0 = Release|Win32 + {E4424774-A7A0-4502-8626-2723904D70EA}.Release|x64.ActiveCfg = Release|Win32 + {E4424774-A7A0-4502-8626-2723904D70EA}.Win32 COFF|Win32.ActiveCfg = Debug|Win32 + {E4424774-A7A0-4502-8626-2723904D70EA}.Win32 COFF|Win32.Build.0 = Debug|Win32 + {E4424774-A7A0-4502-8626-2723904D70EA}.Win32 COFF|x64.ActiveCfg = Release|Win32 + {CCC0643D-7D3F-4D5E-AE0E-C871776E86AF}.Debug GDC|Win32.ActiveCfg = Debug|Win32 + {CCC0643D-7D3F-4D5E-AE0E-C871776E86AF}.Debug GDC|Win32.Build.0 = Debug|Win32 + {CCC0643D-7D3F-4D5E-AE0E-C871776E86AF}.Debug GDC|x64.ActiveCfg = Debug|Win32 + {CCC0643D-7D3F-4D5E-AE0E-C871776E86AF}.Debug|Win32.ActiveCfg = Debug|Win32 + {CCC0643D-7D3F-4D5E-AE0E-C871776E86AF}.Debug|Win32.Build.0 = Debug|Win32 + {CCC0643D-7D3F-4D5E-AE0E-C871776E86AF}.Debug|x64.ActiveCfg = Debug|Win32 + {CCC0643D-7D3F-4D5E-AE0E-C871776E86AF}.Release|Win32.ActiveCfg = Release|Win32 + {CCC0643D-7D3F-4D5E-AE0E-C871776E86AF}.Release|Win32.Build.0 = Release|Win32 + {CCC0643D-7D3F-4D5E-AE0E-C871776E86AF}.Release|x64.ActiveCfg = Release|Win32 + {CCC0643D-7D3F-4D5E-AE0E-C871776E86AF}.Win32 COFF|Win32.ActiveCfg = Debug|Win32 + {CCC0643D-7D3F-4D5E-AE0E-C871776E86AF}.Win32 COFF|Win32.Build.0 = Debug|Win32 + {CCC0643D-7D3F-4D5E-AE0E-C871776E86AF}.Win32 COFF|x64.ActiveCfg = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/src/dviewhelper/dviewhelper.vcxproj b/src/dviewhelper/dviewhelper.vcxproj new file mode 100644 index 0000000..0891430 --- /dev/null +++ b/src/dviewhelper/dviewhelper.vcxproj @@ -0,0 +1,98 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{E4424774-A7A0-4502-8626-2723904D70EA}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <PlatformToolset>v120</PlatformToolset> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <PlatformToolset>v120</PlatformToolset> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <OutDir>../../bin/$(Configuration)\</OutDir> + <IntDir>$(OutDir)$(ProjectName)\</IntDir> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <OutDir>../../bin/$(Configuration)\</OutDir> + <IntDir>$(OutDir)$(ProjectName)\</IntDir> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <PrecompiledHeader /> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + </ClCompile> + <Link> + <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile> + <ModuleDefinitionFile /> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Windows</SubSystem> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention /> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <PrecompiledHeader /> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + </ClCompile> + <Link> + <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Windows</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention /> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="dviewhelper.cpp" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/src/dviewhelper/dviewhelper.vcxproj.filters b/src/dviewhelper/dviewhelper.vcxproj.filters new file mode 100644 index 0000000..1014c03 --- /dev/null +++ b/src/dviewhelper/dviewhelper.vcxproj.filters @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Source Files"> + <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> + <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> + </Filter> + </ItemGroup> + <ItemGroup> + <ClCompile Include="dviewhelper.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/test/Makefile b/test/Makefile index 8a9b284..fdfdf84 100644 --- a/test/Makefile +++ b/test/Makefile @@ -6,7 +6,7 @@ SRC = cvtest.d DBGDIR = ..\bin\Debug
RELDIR = ..\bin\Release
-DMD = c:\l\dmd2.064\windows\bin\dmd.exe
+DMD = c:\l\d\dmd2\windows\bin\dmd.exe
# DMD = c:\l\dmd-1.045\windows\bin\dmd.exe
CV2PDB_DBG = $(DBGDIR)\cv2pdb.exe
diff --git a/test/cvtest.vcxproj b/test/cvtest.vcxproj new file mode 100644 index 0000000..37f117f --- /dev/null +++ b/test/cvtest.vcxproj @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{CCC0643D-7D3F-4D5E-AE0E-C871776E86AF}</ProjectGuid> + <RootNamespace>cvtest</RootNamespace> + <Keyword>MakeFileProj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Makefile</ConfigurationType> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Makefile</ConfigurationType> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <OutDir>..\bin\$(Configuration)\</OutDir> + <IntDir>$(OutDir)</IntDir> + <NMakeBuildCommandLine>nmake -f Makefile</NMakeBuildCommandLine> + <NMakeReBuildCommandLine /> + <NMakeCleanCommandLine /> + <NMakeOutput>..\bin\Debug\cvtest.exe</NMakeOutput> + <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <OutDir>..\bin\$(Configuration)\</OutDir> + <IntDir>$(OutDir)</IntDir> + <NMakeBuildCommandLine>nmake -f Makefile release</NMakeBuildCommandLine> + <NMakeReBuildCommandLine /> + <NMakeCleanCommandLine /> + <NMakeOutput>..\bin\Release\cvtest.exe</NMakeOutput> + <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> + </PropertyGroup> + <ItemDefinitionGroup> + </ItemDefinitionGroup> + <ItemGroup> + <None Include="cvtest.d" /> + <None Include="Makefile" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\src\cv2pdb.vcxproj"> + <Project>{5e2bd27d-446a-4c99-9829-135f7c000d90}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/test/cvtest.vcxproj.user b/test/cvtest.vcxproj.user new file mode 100644 index 0000000..ef5ff2a --- /dev/null +++ b/test/cvtest.vcxproj.user @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup /> +</Project>
\ No newline at end of file |