Changeset 1193 for code/branches/input/visual_studio

Timestamp:

Apr 27, 2008, 1:50:28 PM (16 years ago)

Author:

rgrieder

Message:

• OIS initialise should be complete, but need to use cmake to determine version number..
• merged trunk back

Location:

code/branches/input/visual_studio

Files:

• base_properties_release_sse.vsprops (deleted)
• base_properties_release_sse2.vsprops (deleted)
• core_properties.vsprops (modified) (1 diff)
• orxonox_properties.vsprops (modified) (1 diff)
• orxonox_vc8.sln (modified) (3 diffs)
• tolua_properties.vsprops (moved) (moved from code/branches/input/visual_studio/tolua++_properties.vsprops) (1 diff)
• vc8/tolua.vcproj (moved) (moved from code/branches/input/visual_studio/vc8/tolua++.vcproj) (3 diffs)

code/branches/input/visual_studio/core_properties.vsprops

@@ -12 +12 @@
         <Tool
                 Name="VCLinkerTool"
-                AdditionalDependencies="OgreMain$(CSS).lib OIS$(CS).lib lua51$(CS).lib"
+                AdditionalDependencies="OgreMain$(CSS).lib ois-1.2.0$(CS).lib lua-5.1$(CS).lib"
         />
 </VisualStudioPropertySheet>

code/branches/input/visual_studio/orxonox_properties.vsprops

@@ -14 +14 @@
         <Tool
                 Name="VCLinkerTool"
-                AdditionalDependencies="OgreMain$(CSS).lib OIS$(CS).lib"
+                AdditionalDependencies="OgreMain$(CSS).lib ois-1.2.0$(CS).lib"
                 OutputFile="$(OutDir)$(ProjectName)$(CS).exe"
                 IgnoreDefaultLibraryNames=""

code/branches/input/visual_studio/orxonox_vc8.sln

@@ -57 +57 @@
         EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tolua++", "vc8\tolua++.vcproj", "{35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tolua", "vc8\tolua.vcproj", "{35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}"
         ProjectSection(WebsiteProperties) = preProject
                 Debug.AspNetCompiler.Debug = "True"
@@ -102 +102 @@
                 {2240ECD7-2F48-4431-8E1B-25466A384CCC}.static_libs_release|Win32.ActiveCfg = Release|Win32
                 {F101C2F0-1CB9-4A57-827B-6C399A99B28F}.Debug|Win32.ActiveCfg = Debug|Win32
+                {F101C2F0-1CB9-4A57-827B-6C399A99B28F}.Debug|Win32.Build.0 = Debug|Win32
                 {F101C2F0-1CB9-4A57-827B-6C399A99B28F}.Release|Win32.ActiveCfg = Release|Win32
+                {F101C2F0-1CB9-4A57-827B-6C399A99B28F}.Release|Win32.Build.0 = Release|Win32
                 {F101C2F0-1CB9-4A57-827B-6C399A99B28F}.static_libs_debug|Win32.ActiveCfg = Debug|Win32
                 {F101C2F0-1CB9-4A57-827B-6C399A99B28F}.static_libs_debug|Win32.Build.0 = Debug|Win32
@@ -108 +110 @@
                 {F101C2F0-1CB9-4A57-827B-6C399A99B28F}.static_libs_release|Win32.Build.0 = Release|Win32
                 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}.Debug|Win32.ActiveCfg = Debug|Win32
+                {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}.Debug|Win32.Build.0 = Debug|Win32
                 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}.Release|Win32.ActiveCfg = Release|Win32
+                {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}.Release|Win32.Build.0 = Release|Win32
                 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}.static_libs_debug|Win32.ActiveCfg = Debug|Win32
                 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}.static_libs_debug|Win32.Build.0 = Debug|Win32

code/branches/input/visual_studio/tolua_properties.vsprops

@@ -3 +3 @@
         ProjectType="Visual C++"
         Version="8.00"
-        Name="tolua++_properties"
+        Name="tolua_properties"
         InheritedPropertySheets=".\directory_properties.vsprops"
         >
+        <Tool
+                Name="VCCLCompilerTool"
+                DisableSpecificWarnings="4996"
+        />
 </VisualStudioPropertySheet>

code/branches/input/visual_studio/vc8/tolua.vcproj

@@ -3 +3 @@
         ProjectType="Visual C++"
         Version="8.00"
-        Name="tolua++"
+        Name="tolua"
         ProjectGUID="{35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}"
         RootNamespace="FICN"
@@ -19 +19 @@
                         Name="Debug|Win32"
                         ConfigurationType="4"
-                        InheritedPropertySheets="$(SolutionDir)base_properties_debug.vsprops;..\tolua++_properties.vsprops"
+                        InheritedPropertySheets="$(SolutionDir)base_properties_debug.vsprops;..\tolua_properties.vsprops"
                         CharacterSet="1"
                         >
@@ -71 +71 @@
                         Name="Release|Win32"
                         ConfigurationType="4"
-                        InheritedPropertySheets="$(SolutionDir)base_properties_release.vsprops;..\tolua++_properties.vsprops"
+                        InheritedPropertySheets="$(SolutionDir)base_properties_release.vsprops;..\tolua_properties.vsprops"
                         CharacterSet="1"
                         WholeProgramOptimization="1"