Permalink
Browse files

Fixed Win64 flag

  • Loading branch information...
1 parent ef370b2 commit f0aa8fedbc918e5dc9ba9635d3147744ffe9d7b2 @obones obones committed Sep 24, 2013
@@ -284,7 +284,7 @@
</Delphi.Personality>
<Deployment/>
<Platforms>
- <Platform value="Win64">%WIN64ENABLED%</Platform>
+ <Platform value="Win64">True</Platform>
<Platform value="OSX32">False</Platform>
<Platform value="Win32">True</Platform>
</Platforms>
@@ -15,11 +15,6 @@
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
- <Base_Win64>true</Base_Win64>
- <CfgParent>Base</CfgParent>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
<Base_Win32>true</Base_Win32>
<CfgParent>Base</CfgParent>
@@ -30,12 +25,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
- <Cfg_1_Win64>true</Cfg_1_Win64>
- <CfgParent>Cfg_1</CfgParent>
- <Cfg_1>true</Cfg_1>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
<Cfg_1_Win32>true</Cfg_1_Win32>
<CfgParent>Cfg_1</CfgParent>
@@ -47,12 +36,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
- <Cfg_2_Win64>true</Cfg_2_Win64>
- <CfgParent>Cfg_2</CfgParent>
- <Cfg_2>true</Cfg_2>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
<Cfg_2_Win32>true</Cfg_2_Win32>
<CfgParent>Cfg_2</CfgParent>
@@ -82,12 +65,6 @@
<DCC_ImageBase>$58000000</DCC_ImageBase>
<DCC_UsePackage>rtl;vcl;vclx;designide;Jcl;JclDeveloperTools;$(DCC_UsePackage)</DCC_UsePackage>
</PropertyGroup>
- <PropertyGroup Condition="'$(Base_Win64)'!=''">
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
- <VerInfo_Locale>1033</VerInfo_Locale>
- <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
- </PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
@@ -99,18 +76,6 @@
<DCC_LocalDebugSymbols>True</DCC_LocalDebugSymbols>
<DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
</PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
- <DCC_DcuOutput>..\..\lib\d18\win64\debug</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d18\win64\debug</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d18\win64\debug</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d18\win64\debug</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d18\win64\debug;..\..\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d18\win64\debug;..\..\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d18\win64\debug;..\..\source\include;$(DCC_ObjPath)</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d18\win64\debug;..\..\source\include;$(DCC_IncludePath)</DCC_IncludePath>
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Locale>1033</VerInfo_Locale>
- </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<DCC_DcuOutput>..\..\lib\d18\win32\debug</DCC_DcuOutput>
<DCC_ObjOutput>..\..\lib\d18\win32\debug</DCC_ObjOutput>
@@ -129,18 +94,6 @@
<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
</PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
- <DCC_DcuOutput>..\..\lib\d18\win64</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d18\win64</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d18\win64</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d18\win64</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d18\win64;..\..\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d18\win64;..\..\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d18\win64;..\..\source\include;$(DCC_ObjPath)</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d18\win64;..\..\source\include;$(DCC_IncludePath)</DCC_IncludePath>
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Locale>1033</VerInfo_Locale>
- </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
<DCC_DcuOutput>..\..\lib\d18\win32</DCC_DcuOutput>
<DCC_ObjOutput>..\..\lib\d18\win32</DCC_ObjOutput>
@@ -228,7 +181,7 @@
</Delphi.Personality>
<Deployment/>
<Platforms>
- <Platform value="Win64">%WIN64ENABLED%</Platform>
+ <Platform value="Win64">False</Platform>
<Platform value="OSX32">False</Platform>
<Platform value="Win32">True</Platform>
</Platforms>
@@ -225,7 +225,7 @@
</Delphi.Personality>
<Deployment/>
<Platforms>
- <Platform value="Win64">%WIN64ENABLED%</Platform>
+ <Platform value="Win64">True</Platform>
<Platform value="OSX32">False</Platform>
<Platform value="Win32">True</Platform>
</Platforms>
@@ -15,11 +15,6 @@
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
- <Base_Win64>true</Base_Win64>
- <CfgParent>Base</CfgParent>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
<Base_Win32>true</Base_Win32>
<CfgParent>Base</CfgParent>
@@ -30,12 +25,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
- <Cfg_1_Win64>true</Cfg_1_Win64>
- <CfgParent>Cfg_1</CfgParent>
- <Cfg_1>true</Cfg_1>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
<Cfg_1_Win32>true</Cfg_1_Win32>
<CfgParent>Cfg_1</CfgParent>
@@ -47,12 +36,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
- <Cfg_2_Win64>true</Cfg_2_Win64>
- <CfgParent>Cfg_2</CfgParent>
- <Cfg_2>true</Cfg_2>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
<Cfg_2_Win32>true</Cfg_2_Win32>
<CfgParent>Cfg_2</CfgParent>
@@ -82,12 +65,6 @@
<DCC_ImageBase>$58150000</DCC_ImageBase>
<DCC_UsePackage>rtl;vcl;designide;Jcl;JclBaseExpert;JclDeveloperTools;$(DCC_UsePackage)</DCC_UsePackage>
</PropertyGroup>
- <PropertyGroup Condition="'$(Base_Win64)'!=''">
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
- <VerInfo_Locale>1033</VerInfo_Locale>
- <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
- </PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
@@ -99,18 +76,6 @@
<DCC_LocalDebugSymbols>True</DCC_LocalDebugSymbols>
<DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
</PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
- <DCC_DcuOutput>..\..\lib\d18\win64\debug</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d18\win64\debug</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d18\win64\debug</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d18\win64\debug</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d18\win64\debug;..\..\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d18\win64\debug;..\..\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d18\win64\debug;..\..\source\include;$(DCC_ObjPath)</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d18\win64\debug;..\..\source\include;$(DCC_IncludePath)</DCC_IncludePath>
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Locale>1033</VerInfo_Locale>
- </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<DCC_DcuOutput>..\..\lib\d18\win32\debug</DCC_DcuOutput>
<DCC_ObjOutput>..\..\lib\d18\win32\debug</DCC_ObjOutput>
@@ -129,18 +94,6 @@
<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
</PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
- <DCC_DcuOutput>..\..\lib\d18\win64</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d18\win64</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d18\win64</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d18\win64</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d18\win64;..\..\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d18\win64;..\..\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d18\win64;..\..\source\include;$(DCC_ObjPath)</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d18\win64;..\..\source\include;$(DCC_IncludePath)</DCC_IncludePath>
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Locale>1033</VerInfo_Locale>
- </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
<DCC_DcuOutput>..\..\lib\d18\win32</DCC_DcuOutput>
<DCC_ObjOutput>..\..\lib\d18\win32</DCC_ObjOutput>
@@ -217,7 +170,7 @@
</Delphi.Personality>
<Deployment/>
<Platforms>
- <Platform value="Win64">%WIN64ENABLED%</Platform>
+ <Platform value="Win64">False</Platform>
<Platform value="OSX32">False</Platform>
<Platform value="Win32">True</Platform>
</Platforms>
@@ -15,11 +15,6 @@
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
- <Base_Win64>true</Base_Win64>
- <CfgParent>Base</CfgParent>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
<Base_Win32>true</Base_Win32>
<CfgParent>Base</CfgParent>
@@ -30,12 +25,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
- <Cfg_1_Win64>true</Cfg_1_Win64>
- <CfgParent>Cfg_1</CfgParent>
- <Cfg_1>true</Cfg_1>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
<Cfg_1_Win32>true</Cfg_1_Win32>
<CfgParent>Cfg_1</CfgParent>
@@ -47,12 +36,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
- <Cfg_2_Win64>true</Cfg_2_Win64>
- <CfgParent>Cfg_2</CfgParent>
- <Cfg_2>true</Cfg_2>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
<Cfg_2_Win32>true</Cfg_2_Win32>
<CfgParent>Cfg_2</CfgParent>
@@ -81,12 +64,6 @@
<DCC_ImageBase>$58150000</DCC_ImageBase>
<DCC_UsePackage>rtl;vcl;designide;Jcl;JclBaseExpert;JclDeveloperTools;$(DCC_UsePackage)</DCC_UsePackage>
</PropertyGroup>
- <PropertyGroup Condition="'$(Base_Win64)'!=''">
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
- <VerInfo_Locale>1033</VerInfo_Locale>
- <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
- </PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
@@ -98,18 +75,6 @@
<DCC_LocalDebugSymbols>True</DCC_LocalDebugSymbols>
<DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
</PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
- <DCC_DcuOutput>..\..\lib\d18\win64\debug</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d18\win64\debug</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d18\win64\debug</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d18\win64\debug</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d18\win64\debug;..\..\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d18\win64\debug;..\..\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d18\win64\debug;..\..\source\include;$(DCC_ObjPath)</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d18\win64\debug;..\..\source\include;$(DCC_IncludePath)</DCC_IncludePath>
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Locale>1033</VerInfo_Locale>
- </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<DCC_DcuOutput>..\..\lib\d18\win32\debug</DCC_DcuOutput>
<DCC_ObjOutput>..\..\lib\d18\win32\debug</DCC_ObjOutput>
@@ -128,18 +93,6 @@
<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
</PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
- <DCC_DcuOutput>..\..\lib\d18\win64</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d18\win64</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d18\win64</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d18\win64</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d18\win64;..\..\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d18\win64;..\..\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d18\win64;..\..\source\include;$(DCC_ObjPath)</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d18\win64;..\..\source\include;$(DCC_IncludePath)</DCC_IncludePath>
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Locale>1033</VerInfo_Locale>
- </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
<DCC_DcuOutput>..\..\lib\d18\win32</DCC_DcuOutput>
<DCC_ObjOutput>..\..\lib\d18\win32</DCC_ObjOutput>
@@ -216,7 +169,7 @@
</Delphi.Personality>
<Deployment/>
<Platforms>
- <Platform value="Win64">%WIN64ENABLED%</Platform>
+ <Platform value="Win64">False</Platform>
<Platform value="OSX32">False</Platform>
<Platform value="Win32">True</Platform>
</Platforms>
@@ -242,7 +242,7 @@
</Delphi.Personality>
<Deployment/>
<Platforms>
- <Platform value="Win64">%WIN64ENABLED%</Platform>
+ <Platform value="Win64">True</Platform>
<Platform value="OSX32">False</Platform>
<Platform value="Win32">True</Platform>
</Platforms>
Oops, something went wrong.

0 comments on commit f0aa8fe

Please sign in to comment.