Changeset 2014 for code/branches/core3/visual_studio

Timestamp:

Oct 26, 2008, 12:35:58 AM (16 years ago)

Author:

rgrieder

Message:

Added convert test for gcc.

Location:

code/branches/core3/visual_studio

Files:

• audio_properties.vsprops (modified) (1 diff)
• base_properties.vsprops (modified) (3 diffs)
• core_properties.vsprops (modified) (1 diff)
• orxonox_properties.vsprops (modified) (1 diff)

code/branches/core3/visual_studio/audio_properties.vsprops

@@ -13 +13 @@
         <Tool
                 Name="VCLinkerTool"
-                AdditionalDependencies="libvorbisfile-1.2.0$(CSS).lib alut$(CS).lib OpenAL32$(CS).lib"
+                AdditionalDependencies="vorbisfile$(CSS).lib alut$(CS).lib OpenAL32$(CS).lib"
         />
 </VisualStudioPropertySheet>

code/branches/core3/visual_studio/base_properties.vsprops

@@ -8 +8 @@
         <Tool
                 Name="VCCLCompilerTool"
-                AdditionalIncludeDirectories="&quot;$(RootDir)&quot;;&quot;$(RootDir)src&quot;;&quot;$(RootDir)src\orxonox&quot;;&quot;$(RootDir)src\tolua&quot;;&quot;$(RootDir)src\ois&quot;;&quot;$(LibDir)ogre-1.4.9\OgreMain\include&quot;;&quot;$(LibDir)boost-1.35.0&quot;;&quot;$(LibDir)enet-1.2\include&quot;;&quot;$(LibDir)libogg-1.1.3\include&quot;;&quot;$(LibDir)libvorbis-1.2.0\include&quot;;&quot;$(LibDir)lua-5.1.3\src&quot;;&quot;$(LibDir)openal-1.1\include&quot;;&quot;$(LibDir)openal-1.1\alut\include&quot;;&quot;$(LibDir)tcl-8.5.\generic&quot;;&quot;$(LibDir)zlib-1.2.3&quot;"
+                AdditionalIncludeDirectories="&quot;$(RootDir)&quot;;&quot;$(RootDir)src&quot;;&quot;$(RootDir)src\orxonox&quot;;&quot;$(RootDir)src\ceguilua-0.6.1&quot;;&quot;$(LibDir)ogre-1.4.9\include&quot;;&quot;$(LibDir)boost-1.35.0\include&quot;;&quot;$(LibDir)cegui-0.6.1\include&quot;;&quot;$(LibDir)enet-1.2\include&quot;;&quot;$(LibDir)libogg-1.1.3\include&quot;;&quot;$(LibDir)libvorbis-1.2.0\include&quot;;&quot;$(LibDir)openal-1.1\include&quot;;&quot;$(LibDir)freealut-1.1.0\include&quot;;&quot;$(LibDir)tcl-8.5.2\include&quot;;&quot;$(LibDir)zlib-1.2.3\include&quot;;&quot;$(LibDir)lua-5.1.3\include&quot;"
                 PreprocessorDefinitions="WIN32;__WIN32__;_WIN32;BOOST_ALL_DYN_LINK;OIS_DYNAMIC_LIB; ZLIB_WINAPI"
                 WarningLevel="3"
@@ -22 +22 @@
                 Name="VCLinkerTool"
                 OutputFile="$(OutDir)$(ProjectName)$(CS).dll"
-                AdditionalLibraryDirectories="$(DependencyDir)lib"
+                AdditionalLibraryDirectories="&quot;$(LibDir)boost-1.35.0\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)cegui-0.6.1\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)enet-1.2\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)freealut-1.1.0\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)libogg-1.1.3\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)libvorbis-1.2.0\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)ogre-1.4.9\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)openal-1.1\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)tcl-8.5.2\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)zlib-1.2.3\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)lua-5.1.3\lib\$(ConfigurationName)&quot;"
                 SubSystem="1"
                 ImportLibrary="$(LibOutDir)$(TargetName).lib"
@@ -45 +45 @@
         <UserMacro
                 Name="LibDir"
-                Value="$(RootDir)..\lib_src\"
+                Value="$(RootDir)..\lib_dist\vc8\dependencies\$(SolutionName)\"
         />
         <UserMacro

code/branches/core3/visual_studio/core_properties.vsprops

@@ -13 +13 @@
         <Tool
                 Name="VCLinkerTool"
-                AdditionalDependencies="OgreMain$(CSS).lib lua-5.1.3$(CS).lib tcl85t.lib"
+                AdditionalDependencies="OgreMain$(CSS).lib lua$(CS).lib tcl85t.lib"
         />
 </VisualStudioPropertySheet>

code/branches/core3/visual_studio/orxonox_properties.vsprops

@@ -15 +15 @@
         <Tool
                 Name="VCLinkerTool"
-                AdditionalDependencies="OgreMain$(CSS).lib tcl85t.lib enet-1.2$(CS).lib zlib-1.2.3$(CS).lib"
+                AdditionalDependencies="OgreMain$(CSS).lib tcl85t.lib enet$(CS).lib zlib$(CS).lib"
                 OutputFile="$(OutDir)$(ProjectName)$(CS).exe"
                 IgnoreDefaultLibraryNames="LIBCMT;LIBCMTD"