Browse Source

After 2c784e6f653 IDE has to be defined in My project + Consistently defining IDE in Base group + IDE should not get to release code

Source commit: 2b8e66946483b7d8fb53a9ab5beb37d9b50c88cb
Martin Prikryl 7 years ago
parent
commit
e23a093a4a
4 changed files with 4 additions and 9 deletions
  1. 1 4
      source/DragDropP.cbproj
  2. 1 4
      source/DriveDir.cbproj
  3. 1 0
      source/My.cbproj
  4. 1 1
      source/WinSCP.cbproj

+ 1 - 4
source/DragDropP.cbproj

@@ -52,6 +52,7 @@
 		<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
 		<DCC_UnitSearchPath>packages\my;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
 		<DCC_UNSAFE_TYPE>true</DCC_UNSAFE_TYPE>
+		<Defines>$(Defines)</Defines>
 		<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
 		<ILINK_Description>Drag and Drop Components</ILINK_Description>
 		<ILINK_GenerateImportLibrary>true</ILINK_GenerateImportLibrary>
@@ -68,13 +69,9 @@
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base_Win32)'!=''">
 		<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
-		<Defines>IDE;$(Defines)</Defines>
 		<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
 		<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Base_Win64)'!=''">
-		<Defines>IDE;$(Defines)</Defines>
-	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_1)'!=''">
 		<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
 		<BCC_DisableOptimizations>true</BCC_DisableOptimizations>

+ 1 - 4
source/DriveDir.cbproj

@@ -47,6 +47,7 @@
 		<DCC_TYPEINFO_IMPLICITLY_ADDED>false</DCC_TYPEINFO_IMPLICITLY_ADDED>
 		<DCC_UnitSearchPath>packages\my;packages\dragndrop;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
 		<DCC_UNSAFE_TYPE>true</DCC_UNSAFE_TYPE>
+		<Defines>$(Defines)</Defines>
 		<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
 		<ILINK_Description>Filemanager Toolset</ILINK_Description>
 		<ILINK_GenerateImportLibrary>true</ILINK_GenerateImportLibrary>
@@ -64,10 +65,6 @@
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base_Win32)'!=''">
 		<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
-		<Defines>IDE;$(Defines)</Defines>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(Base_Win64)'!=''">
-		<Defines>IDE;$(Defines)</Defines>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_1)'!=''">
 		<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>

+ 1 - 0
source/My.cbproj

@@ -46,6 +46,7 @@
 		<DCC_EXPLICIT_STRING_CAST_LOSS>true</DCC_EXPLICIT_STRING_CAST_LOSS>
 		<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
 		<DCC_UNSAFE_TYPE>true</DCC_UNSAFE_TYPE>
+		<Defines>$(Defines)</Defines>
 		<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
 		<ILINK_Description>Martin's components</ILINK_Description>
 		<ILINK_GenerateImportLibrary>true</ILINK_GenerateImportLibrary>

+ 1 - 1
source/WinSCP.cbproj

@@ -60,7 +60,7 @@
 		<DCC_SYMBOL_DEPRECATED>false</DCC_SYMBOL_DEPRECATED>
 		<DCC_SYMBOL_PLATFORM>false</DCC_SYMBOL_PLATFORM>
 		<DCC_UNSUPPORTED_CONSTRUCT>false</DCC_UNSUPPORTED_CONSTRUCT>
-		<Defines>IDE;STRICT;$(Defines)</Defines>
+		<Defines>STRICT;$(Defines)</Defines>
 		<FinalOutputDir>$(FINAL_PATH)\$(Platform)\$(Config)</FinalOutputDir>
 		<Icon_MainIcon>resource\Application.ico</Icon_MainIcon>
 		<ILINK_GenerateDRC>true</ILINK_GenerateDRC>