Commit a338afc8 authored by Albert's avatar Albert

Another update for the build system

- .gitignore
src/unistd.h is not on src directory anymore (windows version is on winbuild directory)

- doxywizard.pro.in
consistency 0bj -> ../../objects

- Doxygen.sln
build doxygen 64 bit debug too

- Doxygen.vcproj
Config was missing (cannot be automatic due to the fact that there are 2 rules in 1 file), see also Doxywizard.vcproj

- Doxywizard.vcproj
consistency in respect to directories
$(QTDIR)/mkspecs/msvc2005 -> $(QTDIR)/mkspecs/msvc2008
settings part was present for x64 but not for Win32 (x64 not necessary for doxywizard)
Config_dw was missing (cannot be automatic due to the fact that there are 2 rules in 1 file), see also Doxygen.vcproj

- Version.rules
version.py does not need any arguments

- doxyindexer.vcproj
consistency in respect to directories

- doxysearch.vcproj
consistency in respect to directories
parent f43b013e
...@@ -72,7 +72,6 @@ ...@@ -72,7 +72,6 @@
/src/pyscanner.cpp /src/pyscanner.cpp
/src/scanner.cpp /src/scanner.cpp
/src/tclscanner.cpp /src/tclscanner.cpp
/src/unistd.h
/src/version.cpp /src/version.cpp
/src/vhdlcode.cpp /src/vhdlcode.cpp
/src/vhdlparser.cpp /src/vhdlparser.cpp
......
...@@ -9,7 +9,7 @@ DEPENDPATH += . ...@@ -9,7 +9,7 @@ DEPENDPATH += .
INCLUDEPATH += . INCLUDEPATH += .
QT += xml QT += xml
CONFIG += $extraopts CONFIG += $extraopts
OBJECTS_DIR = obj OBJECTS_DIR = ../../objects
MOC_DIR = moc MOC_DIR = moc
RCC_DIR = rcc RCC_DIR = rcc
DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
......
...@@ -31,6 +31,7 @@ Global ...@@ -31,6 +31,7 @@ Global
{309C9A4A-94D2-4837-9A11-45B0A6CF35C3}.Debug|Win32.ActiveCfg = Debug|Win32 {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|Win32.Build.0 = Debug|Win32
{309C9A4A-94D2-4837-9A11-45B0A6CF35C3}.Debug|x64.ActiveCfg = Debug|x64 {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.ActiveCfg = Release|Win32
{309C9A4A-94D2-4837-9A11-45B0A6CF35C3}.Release|Win32.Build.0 = Release|Win32 {309C9A4A-94D2-4837-9A11-45B0A6CF35C3}.Release|Win32.Build.0 = Release|Win32
{309C9A4A-94D2-4837-9A11-45B0A6CF35C3}.Release|x64.ActiveCfg = Release|x64 {309C9A4A-94D2-4837-9A11-45B0A6CF35C3}.Release|x64.ActiveCfg = Release|x64
......
...@@ -1357,6 +1357,34 @@ ...@@ -1357,6 +1357,34 @@
<File <File
RelativePath="..\src\config.xml" 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> </File>
</Filter> </Filter>
<Filter <Filter
......
This diff is collapsed.
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<CustomBuildRule <CustomBuildRule
Name="Version" Name="Version"
DisplayName="Version" DisplayName="Version"
CommandLine="python $(InputPath) [AllOptions] [AdditionalOptions] [inputs]" CommandLine="python $(InputPath)"
Outputs="$(InputDir)..\src\$(InputName).cpp" Outputs="$(InputDir)..\src\$(InputName).cpp"
FileExtensions="*.py" FileExtensions="*.py"
AdditionalDependencies="$(ProjectDir)..\configure" AdditionalDependencies="$(ProjectDir)..\configure"
......
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)" OutputDirectory="..\bin\Debug"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory=".\Debug"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="1" CharacterSet="1"
BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm" BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
...@@ -102,8 +102,8 @@ ...@@ -102,8 +102,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" OutputDirectory="..\bin\Debug64"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory=".\Debug64"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="1" CharacterSet="1"
BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm" BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
...@@ -181,8 +181,8 @@ ...@@ -181,8 +181,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)" OutputDirectory="..\bin\Relase"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory=".\Release"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="1" CharacterSet="1"
BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm" BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
...@@ -263,8 +263,8 @@ ...@@ -263,8 +263,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" OutputDirectory="..\bin\Relase64"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory=".\Release64"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="1" CharacterSet="1"
BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm" BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
......
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)" OutputDirectory="..\bin\Debug"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory=".\Debug"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="1" CharacterSet="1"
BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm" BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
...@@ -99,8 +99,8 @@ ...@@ -99,8 +99,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" OutputDirectory="..\bin\Debug64"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory=".\Debug64"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="1" CharacterSet="1"
BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm" BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
...@@ -178,8 +178,8 @@ ...@@ -178,8 +178,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)" OutputDirectory="..\bin\Release"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory=".\Release"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="1" CharacterSet="1"
BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm" BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
...@@ -259,8 +259,8 @@ ...@@ -259,8 +259,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" OutputDirectory="..\bin\Release64"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory=".\Release64"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="1" CharacterSet="1"
BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm" BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment