Changeset 788

Timestamp:

Jan 15, 2008, 10:17:06 PM (16 years ago)

Author:

rgrieder

Message:

• added project files for VC9
• updated project settings

Location:

code/branches/FICN

Files:

• . (modified) (1 prop)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• visual_studio/FICN.sln (deleted)
• visual_studio/audio.vcproj (deleted)
• visual_studio/audio_properties.vsprops (deleted)
• visual_studio/base_properties.vsprops (modified) (2 diffs)
• visual_studio/base_properties_debug.vsprops (modified) (2 diffs)
• visual_studio/base_properties_release.vsprops (modified) (1 diff)
• visual_studio/core.vcproj (deleted)
• visual_studio/core_properties.vsprops (deleted)
• visual_studio/loader.vcproj (deleted)
• visual_studio/loader_properties.vsprops (deleted)
• visual_studio/network.vcproj (deleted)
• visual_studio/network_properties.vsprops (deleted)
• visual_studio/orxonox.vcproj (deleted)
• visual_studio/orxonox_properties.vsprops (deleted)
• visual_studio/orxonox_vc8.sln (added)
• visual_studio/orxonox_vc9.sln (added)
• visual_studio/util.vcproj (deleted)
• visual_studio/util_properties.vsprops (deleted)
• visual_studio/vc8 (added)
• visual_studio/vc8/audio.vcproj (added)
• visual_studio/vc8/core.vcproj (added)
• visual_studio/vc8/loader.vcproj (added)
• visual_studio/vc8/network.vcproj (added)
• visual_studio/vc8/orxonox.vcproj (added)
• visual_studio/vc8/util.vcproj (added)
• visual_studio/vc9 (added)
• visual_studio/vc9/audio.vcproj (added)
• visual_studio/vc9/core.vcproj (added)
• visual_studio/vc9/loader.vcproj (added)
• visual_studio/vc9/network.vcproj (added)
• visual_studio/vc9/orxonox.vcproj (added)
• visual_studio/vc9/util.vcproj (added)

code/branches/FICN/src/orxonox/OrxonoxPrereqs.h

@@ -39 +39 @@
 // Shared library settings
 //-----------------------------------------------------------------------
-#if (ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32) && !defined( ORXONOX_STATIC_BUILD )
+#if (ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32) && !(defined(ORXONOX_STATIC_BUILD) || defined(ORXONOX_NO_EXPORTS))
 #  ifdef ORXONOX_SHARED_BUILD
 #    define _OrxonoxExport __declspec(dllexport)

code/branches/FICN/visual_studio/base_properties.vsprops

@@ -4 +4 @@
         Version="8.00"
         Name="base_properties"
-        OutputDirectory="$(SolutionDir)\..\bin"
-        IntermediateDirectory="$(SolutionDir)\obj\$(ProjectName)\$(ConfigurationName)"
+        OutputDirectory="$(RootDir)bin\"
+        IntermediateDirectory="$(SolutionDir)obj\$(SolutionName)\$(ProjectName)\$(ConfigurationName)\"
         >
         <Tool
                 Name="VCCLCompilerTool"
-                AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\src&quot;;&quot;$(SolutionDir)\..\src\orxonox&quot;;&quot;$(OGRE_HOME)\Dependencies\include&quot;;&quot;$(OGRE_HOME)\OgreMain\include&quot;;&quot;$(ORXONOX_HOME)\dependencies\include&quot;"
+                AdditionalIncludeDirectories="&quot;$(RootDir)src&quot;;&quot;$(RootDir)src\orxonox&quot;;&quot;$(RootDir)dependencies\include&quot;"
                 PreprocessorDefinitions="WIN32;__WIN32__;_WIN32;BOOST_ALL_DYN_LINK"
                 WarningLevel="3"
-                Detect64BitPortabilityProblems="true"
                 DebugInformationFormat="3"
                 DisableSpecificWarnings="4267; 4244; 4251"
@@ -18 +17 @@
         <Tool
                 Name="VCLibrarianTool"
-                AdditionalLibraryDirectories="&quot;$(OGRE_HOME)\lib&quot;;&quot;$(OGRE_HOME)\dependencies\lib\$(ConfigurationName)&quot;;&quot;$(ORXONOX_HOME)\dependencies\lib&quot;"
+                OutputFile="$(LibDir)$(ProjectName).lib"
+                AdditionalLibraryDirectories="$(RootDir)dependencies\lib"
                 IgnoreAllDefaultLibraries="true"
         />
         <Tool
                 Name="VCLinkerTool"
-                AdditionalLibraryDirectories="&quot;$(OGRE_HOME)\lib&quot;;&quot;$(OGRE_HOME)\dependencies\lib\$(ConfigurationName)&quot;;&quot;$(ORXONOX_HOME)\dependencies\lib&quot;"
+                OutputFile="$(OutDir)$(ProjectName).dll"
+                AdditionalLibraryDirectories="$(RootDir)dependencies\lib"
                 SubSystem="2"
+                RandomizedBaseAddress="1"
+                DataExecutionPrevention="0"
+                ImportLibrary="$(RootDir)lib\$(TargetName).lib"
                 TargetMachine="1"
         />
+        <UserMacro
+                Name="RootDir"
+                Value="$(SolutionDir)..\"
+        />
+        <UserMacro
+                Name="LibDir"
+                Value="$(RootDir)lib\"
+        />
 </VisualStudioPropertySheet>

code/branches/FICN/visual_studio/base_properties_debug.vsprops

@@ -4 +4 @@
         Version="8.00"
         Name="base_properties_debug"
-        InheritedPropertySheets=".\base_properties.vsprops"
+        InheritedPropertySheets="$(SolutionDir)base_properties.vsprops"
         >
         <Tool
@@ -17 +17 @@
         <Tool
                 Name="VCLibrarianTool"
-                OutputFile="$(OutDir)\$(ProjectName)_d.lib"
+                OutputFile="$(LibDir)$(ProjectName)_d.lib"
         />
         <Tool
                 Name="VCLinkerTool"
-                OutputFile="$(OutDir)\$(ProjectName)_d.exe"
+                OutputFile="$(OutDir)$(ProjectName)_d.dll"
                 LinkIncremental="2"
                 GenerateDebugInformation="true"

code/branches/FICN/visual_studio/base_properties_release.vsprops

@@ -17 +17 @@
                 Name="VCLinkerTool"
                 LinkIncremental="1"
-                GenerateDebugInformation="true"
+                GenerateDebugInformation="false"
                 OptimizeReferences="2"
                 EnableCOMDATFolding="2"