Menu
▾
▴
[Tora-cvs] SF.net SVN: tora:[3249] branches/tora-trotl
|
From: <ibr...@us...> - 2009-08-23 18:35:31
|
Revision: 3249
http://tora.svn.sourceforge.net/tora/?rev=3249&view=rev
Author: ibre5041
Date: 2009-08-23 18:35:20 +0000 (Sun, 23 Aug 2009)
Log Message:
-----------
Win. build process.
Modified Paths:
--------------
branches/tora-trotl/tora-trotl.vcproj
branches/tora-trotl/tora-trotl_test0.vcproj
branches/tora-trotl/tora-trotl_test1.vcproj
branches/tora-trotl/tora-trotl_test2.vcproj
Modified: branches/tora-trotl/tora-trotl.vcproj
===================================================================
--- branches/tora-trotl/tora-trotl.vcproj 2009-08-20 06:17:13 UTC (rev 3248)
+++ branches/tora-trotl/tora-trotl.vcproj 2009-08-23 18:35:20 UTC (rev 3249)
@@ -22,6 +22,7 @@
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="0"
+ BuildLogFile="$(IntDir)$(ProjectName)\BuildLog.htm"
>
<Tool
Name="VCPreBuildEventTool"
@@ -42,18 +43,22 @@
Name="VCCLCompilerTool"
UseUnicodeResponseFiles="false"
Optimization="0"
- AdditionalIncludeDirectories="E:\oracle\Ora11g\xdk\include;E:\oracle\Ora11g\precomp\public;E:\oracle\Ora11g\oci\include;"C:\Program Files\boost\boost_1_38";E:\trotl\src;"E:\qt-win-opensource-src-4.4.3\include";"E:\qt-win-opensource-src-4.4.3\include\QtCore";"E:\qt-win-opensource-src-4.4.3\include\QtGui";"E:\qt-win-opensource-src-4.4.3\include\QtNetwork";"E:\qt-win-opensource-src-4.4.3\include\QtSql";"E:\tora-trotl\src";"E:\tora-trotl\src\loki\include";"E:\tora-trotl\src\windows";"E:\tora-trotl\src\qscintilla2\Qt4""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;_CRT_SECURE_NO_WARNINGS;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\""
+ AdditionalIncludeDirectories=""$(ORACLE_HOME)\xdk\include";"$(ORACLE_HOME)\precomp\public";"$(ORACLE_HOME)\oci\include";"C:\Program Files\boost\boost_1_38";C:\trotl\src;"$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtSql";"$(ProjectDir)\src";"$(ProjectDir)\src\loki\include";"$(ProjectDir)\src\windows";"$(ProjectDir)\src\qscintilla2\Qt4""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\";TOMONOLITHIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;OTL_ORA10G_R2;DBLINK;HAVE_CONFIG_H;SCI_LEXER"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="1"
PrecompiledHeaderThrough="precompiled.h"
+ PrecompiledHeaderFile="$(IntDir)$(ProjectName)\$(TargetName).pch"
+ ObjectFile="$(IntDir)$(ProjectName)\"
+ ProgramDataBaseFileName="$(IntDir)$(ProjectName)\$(ProjectName)vc90.pdb"
+ XMLDocumentationFileName="$(IntDir)$(ProjectName)\"
BrowseInformation="1"
+ BrowseInformationFile="$(IntDir)$(ProjectName)\"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
ForcedIncludeFiles="precompiled.h"
- ShowIncludes="true"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -67,8 +72,9 @@
<Tool
Name="VCLinkerTool"
UseUnicodeResponseFiles="false"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtSqld4.lib oci.lib oraxml11.lib tora_qscintilla2_lib.lib tora_loki_lib.lib trotld.lib wsock32.lib"
- AdditionalLibraryDirectories="E:\trotl\Debug;"C:\Program Files\boost\boost_1_38\libs";E:\oracle\Ora11g\oci\lib\msvc\;E:\oracle\Ora11g\LIB\;"E:\qt-win-opensource-src-4.4.3\lib\";"E:\tora-trotl\src\qscintilla2";"E:\tora-trotl\src\loki";"E:\tora-trotl\src\windows""
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtSqld4.lib oci.lib oraxml11.lib wsock32.lib"
+ AdditionalLibraryDirectories=""$(OutDir)";"C:\Program Files\boost\boost_1_38\libs";"$(ORACLE_HOME)\oci\lib\msvc";"$(ORACLE_HOME)\LIB";"$(QTDIR)\lib""
+ ManifestFile="$(IntDir)$(ProjectName)\$(TargetFileName).intermediate.manifest"
GenerateDebugInformation="true"
AssemblyDebug="1"
SubSystem="1"
@@ -101,7 +107,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="0"
WholeProgramOptimization="1"
>
<Tool
@@ -123,12 +129,16 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+ AdditionalIncludeDirectories=""$(ORACLE_HOME)\xdk\include";"$(ORACLE_HOME)\precomp\public";"$(ORACLE_HOME)\oci\include";"C:\Program Files\boost\boost_1_38";C:\trotl\src;"$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtSql";"$(ProjectDir)\src";"$(ProjectDir)\src\loki\include";"$(ProjectDir)\src\windows";"$(ProjectDir)\src\qscintilla2\Qt4""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\";TOMONOLITHIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;OTL_ORA10G_R2;DBLINK;HAVE_CONFIG_H;SCI_LEXER"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="1"
+ PrecompiledHeaderThrough="precompiled.h"
+ PrecompiledHeaderFile="$(IntDir)$(ProjectName)\$(TargetName).pch"
WarningLevel="3"
DebugInformationFormat="3"
+ ForcedIncludeFiles="precompiled.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -141,7 +151,9 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtSql4.lib oci.lib oraxml11.lib wsock32.lib"
LinkIncremental="1"
+ AdditionalLibraryDirectories=""$(OutDir)";"C:\Program Files\boost\boost_1_38\libs";"$(ORACLE_HOME)\oci\lib\msvc";"$(ORACLE_HOME)\LIB";"$(QTDIR)\lib""
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
@@ -180,10 +192,6 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath=".\src\windows\cregistry.cpp"
- >
- </File>
- <File
RelativePath=".\src\main.cpp"
>
</File>
@@ -2159,14 +2167,6 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
- <File
- RelativePath=".\src\windows\tora.ico"
- >
- </File>
- <File
- RelativePath=".\src\windows\tora.rc"
- >
- </File>
</Filter>
</Files>
<Globals>
Modified: branches/tora-trotl/tora-trotl_test0.vcproj
===================================================================
--- branches/tora-trotl/tora-trotl_test0.vcproj 2009-08-20 06:17:13 UTC (rev 3248)
+++ branches/tora-trotl/tora-trotl_test0.vcproj 2009-08-23 18:35:20 UTC (rev 3249)
@@ -22,6 +22,7 @@
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="0"
+ BuildLogFile="$(IntDir)$(ProjectName)\BuildLog.htm"
>
<Tool
Name="VCPreBuildEventTool"
@@ -42,13 +43,18 @@
Name="VCCLCompilerTool"
UseUnicodeResponseFiles="false"
Optimization="0"
- AdditionalIncludeDirectories="E:\oracle\Ora11g\xdk\include;E:\oracle\Ora11g\precomp\public;E:\oracle\Ora11g\oci\include;"C:\Program Files\boost\boost_1_38";E:\trotl\src;"E:\qt-win-opensource-src-4.4.3\include";"E:\qt-win-opensource-src-4.4.3\include\QtCore";"E:\qt-win-opensource-src-4.4.3\include\QtGui";"E:\qt-win-opensource-src-4.4.3\include\QtNetwork";"E:\qt-win-opensource-src-4.4.3\include\QtSql";"E:\tora-trotl\src\loki\include";"E:\tora-trotl\src\windows";"E:\tora-trotl\src\qscintilla2\Qt4";"E:\tora-trotl\src""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;_CRT_SECURE_NO_WARNINGS;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\""
+ AdditionalIncludeDirectories=""$(ORACLE_HOME)\xdk\include";"$(ORACLE_HOME)\precomp\public";"$(ORACLE_HOME)\oci\include";"C:\Program Files\boost\boost_1_38";C:\trotl\src;"$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtSql";"$(ProjectDir)\src\loki\include";"$(ProjectDir)\src\windows";"$(ProjectDir)\src\qscintilla2\Qt4";"$(ProjectDir)\src""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\";TOMONOLITHIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;OTL_ORA10G_R2;DBLINK;HAVE_CONFIG_H;SCI_LEXER"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="1"
PrecompiledHeaderThrough="precompiled.h"
+ PrecompiledHeaderFile="$(IntDir)$(ProjectName)\$(TargetName).pch"
+ ObjectFile="$(IntDir)$(ProjectName)\"
+ ProgramDataBaseFileName="$(IntDir)$(ProjectName)\$(ProjectName)vc90.pdb"
+ XMLDocumentationFileName="$(IntDir)$(ProjectName)\"
BrowseInformation="1"
+ BrowseInformationFile="$(IntDir)$(ProjectName)\"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
@@ -66,8 +72,9 @@
<Tool
Name="VCLinkerTool"
UseUnicodeResponseFiles="false"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtSqld4.lib oci.lib oraxml11.lib tora_qscintilla2_lib.lib tora_loki_lib.lib trotld.lib wsock32.lib"
- AdditionalLibraryDirectories="E:\trotl\src;"C:\Program Files\boost\boost_1_38\libs";E:\oracle\Ora11g\oci\lib\msvc\;E:\oracle\Ora11g\LIB\;"E:\qt-win-opensource-src-4.4.3\lib\";"E:\tora-trotl\src\qscintilla2";"E:\tora-trotl\src\loki";"E:\tora-trotl\src\windows""
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtSqld4.lib oci.lib oraxml11.lib wsock32.lib"
+ AdditionalLibraryDirectories=""C:\Program Files\boost\boost_1_38\libs";"$(ORACLE_HOME)\oci\lib\msvc";"$(ORACLE_HOME)\LIB";"$(QTDIR)\lib""
+ ManifestFile="$(IntDir)$(ProjectName)\$(TargetFileName).intermediate.manifest"
GenerateDebugInformation="true"
AssemblyDebug="1"
SubSystem="1"
@@ -122,7 +129,8 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+ AdditionalIncludeDirectories=""$(ORACLE_HOME)\xdk\include";"$(ORACLE_HOME)\precomp\public";"$(ORACLE_HOME)\oci\include";"C:\Program Files\boost\boost_1_38";C:\trotl\src;"$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtSql";"$(ProjectDir)\src\loki\include";"$(ProjectDir)\src\windows";"$(ProjectDir)\src\qscintilla2\Qt4";"$(ProjectDir)\src""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\";TOMONOLITHIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;OTL_ORA10G_R2;DBLINK;HAVE_CONFIG_H;SCI_LEXER"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
@@ -141,6 +149,7 @@
<Tool
Name="VCLinkerTool"
LinkIncremental="1"
+ AdditionalLibraryDirectories=""C:\Program Files\boost\boost_1_38\libs";"$(ORACLE_HOME)\oci\lib\msvc";"$(ORACLE_HOME)\LIB";"$(QTDIR)\lib""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
@@ -179,10 +188,6 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath=".\src\windows\cregistry.cpp"
- >
- </File>
- <File
RelativePath=".\src\shortcuteditor\moc_shortcuteditordialog.cxx"
>
</File>
@@ -2158,14 +2163,6 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
- <File
- RelativePath=".\src\windows\tora.ico"
- >
- </File>
- <File
- RelativePath=".\src\windows\tora.rc"
- >
- </File>
</Filter>
</Files>
<Globals>
Modified: branches/tora-trotl/tora-trotl_test1.vcproj
===================================================================
--- branches/tora-trotl/tora-trotl_test1.vcproj 2009-08-20 06:17:13 UTC (rev 3248)
+++ branches/tora-trotl/tora-trotl_test1.vcproj 2009-08-23 18:35:20 UTC (rev 3249)
@@ -42,13 +42,18 @@
Name="VCCLCompilerTool"
UseUnicodeResponseFiles="false"
Optimization="0"
- AdditionalIncludeDirectories="E:\oracle\Ora11g\xdk\include;E:\oracle\Ora11g\precomp\public;E:\oracle\Ora11g\oci\include;"C:\Program Files\boost\boost_1_38";E:\trotl\src;"E:\qt-win-opensource-src-4.4.3\include";"E:\qt-win-opensource-src-4.4.3\include\QtCore";"E:\qt-win-opensource-src-4.4.3\include\QtGui";"E:\qt-win-opensource-src-4.4.3\include\QtNetwork";"E:\qt-win-opensource-src-4.4.3\include\QtSql";"E:\tora-trotl\src\loki\include";"E:\tora-trotl\src\windows";"E:\tora-trotl\src\qscintilla2\Qt4""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;_CRT_SECURE_NO_WARNINGS;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\""
+ AdditionalIncludeDirectories=""$(ORACLE_HOME)\xdk\include";"$(ORACLE_HOME)\precomp\public";"$(ORACLE_HOME)\oci\include";"C:\Program Files\boost\boost_1_38";C:\trotl\src;"$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtSql";"$(ProjectDir)\src";"$(ProjectDir)\src\loki\include";"$(ProjectDir)\src\windows";"$(ProjectDir)\src\qscintilla2\Qt4""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\";TOMONOLITHIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;OTL_ORA10G_R2;DBLINK;HAVE_CONFIG_H;SCI_LEXER"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="1"
PrecompiledHeaderThrough="precompiled.h"
+ PrecompiledHeaderFile="$(IntDir)$(ProjectName)\$(TargetName).pch"
+ ObjectFile="$(IntDir)$(ProjectName)\"
+ ProgramDataBaseFileName="$(IntDir)$(ProjectName)\$(ProjectName)vc90.pdb"
+ XMLDocumentationFileName="$(IntDir)$(ProjectName)\"
BrowseInformation="1"
+ BrowseInformationFile="$(IntDir)$(ProjectName)\"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
@@ -66,8 +71,9 @@
<Tool
Name="VCLinkerTool"
UseUnicodeResponseFiles="false"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtSqld4.lib oci.lib oraxml11.lib tora_qscintilla2_lib.lib tora_loki_lib.lib trotld.lib wsock32.lib"
- AdditionalLibraryDirectories="E:\trotl\Debug;"C:\Program Files\boost\boost_1_38\libs";E:\oracle\Ora11g\oci\lib\msvc\;E:\oracle\Ora11g\LIB\;"E:\qt-win-opensource-src-4.4.3\lib\";"E:\tora-trotl\src\qscintilla2";"E:\tora-trotl\src\loki";"E:\tora-trotl\src\windows""
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtSqld4.lib oci.lib oraxml11.lib wsock32.lib"
+ AdditionalLibraryDirectories=""C:\Program Files\boost\boost_1_38\libs";"$(ORACLE_HOME)\oci\lib\msvc";"$(ORACLE_HOME)\LIB";"$(QTDIR)\lib""
+ ManifestFile="$(IntDir)$(ProjectName)\$(TargetFileName).intermediate.manifest"
GenerateDebugInformation="true"
AssemblyDebug="1"
SubSystem="1"
@@ -122,6 +128,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
+ AdditionalIncludeDirectories=""$(ORACLE_HOME)\xdk\include";"$(ORACLE_HOME)\precomp\public";"$(ORACLE_HOME)\oci\include";"C:\Program Files\boost\boost_1_38";C:\trotl\src;"$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtSql";"$(ProjectDir)\src";"$(ProjectDir)\src\loki\include";"$(ProjectDir)\src\windows";"$(ProjectDir)\src\qscintilla2\Qt4""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -141,6 +148,7 @@
<Tool
Name="VCLinkerTool"
LinkIncremental="1"
+ AdditionalLibraryDirectories=""C:\Program Files\boost\boost_1_38\libs";"$(ORACLE_HOME)\oci\lib\msvc";"$(ORACLE_HOME)\LIB";"$(QTDIR)\lib""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
@@ -179,10 +187,6 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath=".\src\windows\cregistry.cpp"
- >
- </File>
- <File
RelativePath=".\src\shortcuteditor\moc_shortcuteditordialog.cxx"
>
</File>
@@ -2158,14 +2162,6 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
- <File
- RelativePath=".\src\windows\tora.ico"
- >
- </File>
- <File
- RelativePath=".\src\windows\tora.rc"
- >
- </File>
</Filter>
</Files>
<Globals>
Modified: branches/tora-trotl/tora-trotl_test2.vcproj
===================================================================
--- branches/tora-trotl/tora-trotl_test2.vcproj 2009-08-20 06:17:13 UTC (rev 3248)
+++ branches/tora-trotl/tora-trotl_test2.vcproj 2009-08-23 18:35:20 UTC (rev 3249)
@@ -42,13 +42,18 @@
Name="VCCLCompilerTool"
UseUnicodeResponseFiles="false"
Optimization="0"
- AdditionalIncludeDirectories="E:\oracle\Ora11g\xdk\include;E:\oracle\Ora11g\precomp\public;E:\oracle\Ora11g\oci\include;"C:\Program Files\boost\boost_1_38";E:\trotl\src;"E:\qt-win-opensource-src-4.4.3\include";"E:\qt-win-opensource-src-4.4.3\include\QtCore";"E:\qt-win-opensource-src-4.4.3\include\QtGui";"E:\qt-win-opensource-src-4.4.3\include\QtNetwork";"E:\qt-win-opensource-src-4.4.3\include\QtSql";"E:\tora-trotl\src\loki\include";"E:\tora-trotl\src\windows";"E:\tora-trotl\src\qscintilla2\Qt4""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;_CRT_SECURE_NO_WARNINGS;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\""
+ AdditionalIncludeDirectories=""$(ORACLE_HOME)\xdk\include";"$(ORACLE_HOME)\precomp\public";"$(ORACLE_HOME)\oci\include";"C:\Program Files\boost\boost_1_38";C:\trotl\src;"$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtSql";"$(ProjectDir)\src";"$(ProjectDir)\src\loki\include";"$(ProjectDir)\src\windows";"$(ProjectDir)\src\qscintilla2\Qt4""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;EXPLICIT_EXPORT;LOKI_STATIC;TROTL_DLL;DEFAULT_PLUGIN_DIR=\"e:/tora/DEBUG/share/tora/\";TOMONOLITHIC;QT;QT_DLL;QT_GUI_LIB;QT_XML_LIB;QT_SQL_LIB;QT_NETWORK_LIB;QT_CORE_LIB;QT_THREAD_LIB;OTL_ORA10G_R2;DBLINK;HAVE_CONFIG_H;SCI_LEXER"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="1"
PrecompiledHeaderThrough="precompiled.h"
+ PrecompiledHeaderFile="$(IntDir)$(ProjectName)\$(TargetName).pch"
+ ObjectFile="$(IntDir)$(ProjectName)\"
+ ProgramDataBaseFileName="$(IntDir)$(ProjectName)\$(ProjectName)vc90.pdb"
+ XMLDocumentationFileName="$(IntDir)$(ProjectName)\"
BrowseInformation="1"
+ BrowseInformationFile="$(IntDir)$(ProjectName)\"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
@@ -66,8 +71,9 @@
<Tool
Name="VCLinkerTool"
UseUnicodeResponseFiles="false"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtSqld4.lib oci.lib oraxml11.lib tora_qscintilla2_lib.lib tora_loki_lib.lib trotld.lib wsock32.lib"
- AdditionalLibraryDirectories="E:\trotl\src;"C:\Program Files\boost\boost_1_38\libs";E:\oracle\Ora11g\oci\lib\msvc\;E:\oracle\Ora11g\LIB\;"E:\qt-win-opensource-src-4.4.3\lib\";"E:\tora-trotl\src\qscintilla2";"E:\tora-trotl\src\loki";"E:\tora-trotl\src\windows""
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtSqld4.lib oci.lib oraxml11.lib wsock32.lib"
+ AdditionalLibraryDirectories=""C:\Program Files\boost\boost_1_38\libs";"$(ORACLE_HOME)\oci\lib\msvc";"$(ORACLE_HOME)\LIB";"$(QTDIR)\lib""
+ ManifestFile="$(IntDir)$(ProjectName)\$(TargetFileName).intermediate.manifest"
GenerateDebugInformation="true"
AssemblyDebug="1"
SubSystem="1"
@@ -141,6 +147,7 @@
<Tool
Name="VCLinkerTool"
LinkIncremental="1"
+ AdditionalLibraryDirectories=""C:\Program Files\boost\boost_1_38\libs";"$(ORACLE_HOME)\oci\lib\msvc";"$(ORACLE_HOME)\LIB";"$(QTDIR)\lib""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
@@ -179,10 +186,6 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath=".\src\windows\cregistry.cpp"
- >
- </File>
- <File
RelativePath=".\src\shortcuteditor\moc_shortcuteditordialog.cxx"
>
</File>
@@ -2158,14 +2161,6 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
- <File
- RelativePath=".\src\windows\tora.ico"
- >
- </File>
- <File
- RelativePath=".\src\windows\tora.rc"
- >
- </File>
</Filter>
</Files>
<Globals>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|