Merge branch 'feature/build1' of https://github.com/albert-github/doxygen into...

Merge branch 'feature/build1' of https://github.com/albert-github/doxygen into albert-github-feature/build1

.gitignore

@@ -72,7 +72,6 @@
 /src/pyscanner.cpp
 /src/scanner.cpp
 /src/tclscanner.cpp
-/src/unistd.h
 /src/version.cpp
 /src/vhdlcode.cpp
 /src/vhdlparser.cpp

addon/doxywizard/doxywizard.pro.in

@@ -9,7 +9,7 @@ DEPENDPATH  += .
 INCLUDEPATH += .
 QT          += xml
 CONFIG      += $extraopts
-OBJECTS_DIR  = obj
+OBJECTS_DIR  = ../../objects
 MOC_DIR      = moc
 RCC_DIR      = rcc
 DEFINES     += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII

winbuild/Doxygen.sln

@@ -31,6 +31,7 @@ Global
 		{309C9A4A-94D2-4837-9A11-45B0A6CF35C3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{309C9A4A-94D2-4837-9A11-45B0A6CF35C3}.Debug|Win32.Build.0 = Debug|Win32
 		{309C9A4A-94D2-4837-9A11-45B0A6CF35C3}.Debug|x64.ActiveCfg = Debug|x64
+		{309C9A4A-94D2-4837-9A11-45B0A6CF35C3}.Debug|x64.Build.0 = Debug|x64
 		{309C9A4A-94D2-4837-9A11-45B0A6CF35C3}.Release|Win32.ActiveCfg = Release|Win32
 		{309C9A4A-94D2-4837-9A11-45B0A6CF35C3}.Release|Win32.Build.0 = Release|Win32
 		{309C9A4A-94D2-4837-9A11-45B0A6CF35C3}.Release|x64.ActiveCfg = Release|x64

winbuild/Doxygen.vcproj

@@ -1357,6 +1357,34 @@
 			<File
 				RelativePath="..\src\config.xml"
 				>
+				<FileConfiguration
+					Name="Debug|win32"
+					>
+					<Tool
+						Name="Config"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|win32"
+					>
+					<Tool
+						Name="Config"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="Config"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="Config"
+					/>
+				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter

winbuild/Version.rules

@@ -7,7 +7,7 @@
 		<CustomBuildRule
 			Name="Version"
 			DisplayName="Version"
-			CommandLine="python $(InputPath) [AllOptions] [AdditionalOptions] [inputs]"
+			CommandLine="python $(InputPath)"
 			Outputs="$(InputDir)..\src\$(InputName).cpp"
 			FileExtensions="*.py"
 			AdditionalDependencies="$(ProjectDir)..\configure"

winbuild/doxyindexer.vcproj

@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="..\bin\Debug"
+			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
 			CharacterSet="1"
 			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
@@ -102,8 +102,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="..\bin\Debug64"
+			IntermediateDirectory=".\Debug64"
 			ConfigurationType="1"
 			CharacterSet="1"
 			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
@@ -181,8 +181,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="..\bin\Relase"
+			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
 			CharacterSet="1"
 			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
@@ -263,8 +263,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="..\bin\Relase64"
+			IntermediateDirectory=".\Release64"
 			ConfigurationType="1"
 			CharacterSet="1"
 			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"

winbuild/doxysearch.vcproj

@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="..\bin\Debug"
+			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
 			CharacterSet="1"
 			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
@@ -99,8 +99,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="..\bin\Debug64"
+			IntermediateDirectory=".\Debug64"
 			ConfigurationType="1"
 			CharacterSet="1"
 			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
@@ -178,8 +178,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="..\bin\Release"
+			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
 			CharacterSet="1"
 			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
@@ -259,8 +259,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="..\bin\Release64"
+			IntermediateDirectory=".\Release64"
 			ConfigurationType="1"
 			CharacterSet="1"
 			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"