updateluabind

OLR-xray · Jan 27, 2016 · 36c6124 · 36c6124
1 parent 495e54c
commit 36c6124
Show file tree

Hide file tree

Showing 37 changed files with 96 additions and 2 deletions.
diff --git a/binaries/Debug/Win32/XR_3DA.exe b/binaries/Debug/Win32/XR_3DA.exe
diff --git a/binaries/Debug/Win32/lua5.1.dll b/binaries/Debug/Win32/lua5.1.dll
diff --git a/binaries/Debug/Win32/luabind.dll b/binaries/Debug/Win32/luabind.dll
diff --git a/binaries/Debug/Win32/xrCDB.dll b/binaries/Debug/Win32/xrCDB.dll
diff --git a/binaries/Debug/Win32/xrCPU_Pipe.dll b/binaries/Debug/Win32/xrCPU_Pipe.dll
diff --git a/binaries/Debug/Win32/xrCore.dll b/binaries/Debug/Win32/xrCore.dll
diff --git a/binaries/Debug/Win32/xrGame.dll b/binaries/Debug/Win32/xrGame.dll
diff --git a/binaries/Debug/Win32/xrNetServer.dll b/binaries/Debug/Win32/xrNetServer.dll
diff --git a/binaries/Debug/Win32/xrParticles.dll b/binaries/Debug/Win32/xrParticles.dll
diff --git a/binaries/Debug/Win32/xrRender_R1.dll b/binaries/Debug/Win32/xrRender_R1.dll
diff --git a/binaries/Debug/Win32/xrRender_R2.dll b/binaries/Debug/Win32/xrRender_R2.dll
diff --git a/binaries/Debug/Win32/xrSound.dll b/binaries/Debug/Win32/xrSound.dll
diff --git a/binaries/Debug/Win32/xrXMLParser.dll b/binaries/Debug/Win32/xrXMLParser.dll
diff --git a/libraries/Debug/Win32/Luabind.exp b/libraries/Debug/Win32/Luabind.exp
diff --git a/libraries/Debug/Win32/Luabind.lib b/libraries/Debug/Win32/Luabind.lib
diff --git a/libraries/Debug/Win32/XR_3DA.exp b/libraries/Debug/Win32/XR_3DA.exp
diff --git a/libraries/Debug/Win32/XR_3DA.lib b/libraries/Debug/Win32/XR_3DA.lib
diff --git a/libraries/Debug/Win32/lua5.1.exp b/libraries/Debug/Win32/lua5.1.exp
diff --git a/libraries/Debug/Win32/lua5.1.lib b/libraries/Debug/Win32/lua5.1.lib
diff --git a/libraries/Debug/Win32/xrCDB.exp b/libraries/Debug/Win32/xrCDB.exp
diff --git a/libraries/Debug/Win32/xrCDB.lib b/libraries/Debug/Win32/xrCDB.lib
diff --git a/libraries/Debug/Win32/xrCPU_Pipe.exp b/libraries/Debug/Win32/xrCPU_Pipe.exp
diff --git a/libraries/Debug/Win32/xrCPU_Pipe.lib b/libraries/Debug/Win32/xrCPU_Pipe.lib
diff --git a/libraries/Debug/Win32/xrCore.exp b/libraries/Debug/Win32/xrCore.exp
diff --git a/libraries/Debug/Win32/xrCore.lib b/libraries/Debug/Win32/xrCore.lib
diff --git a/libraries/Debug/Win32/xrGame.exp b/libraries/Debug/Win32/xrGame.exp
diff --git a/libraries/Debug/Win32/xrGame.lib b/libraries/Debug/Win32/xrGame.lib
diff --git a/libraries/Debug/Win32/xrNetServer.exp b/libraries/Debug/Win32/xrNetServer.exp
diff --git a/libraries/Debug/Win32/xrNetServer.lib b/libraries/Debug/Win32/xrNetServer.lib
diff --git a/libraries/Debug/Win32/xrParticles.exp b/libraries/Debug/Win32/xrParticles.exp
diff --git a/libraries/Debug/Win32/xrParticles.lib b/libraries/Debug/Win32/xrParticles.lib
diff --git a/libraries/Debug/Win32/xrSound.exp b/libraries/Debug/Win32/xrSound.exp
diff --git a/libraries/Debug/Win32/xrSound.lib b/libraries/Debug/Win32/xrSound.lib
diff --git a/libraries/Debug/Win32/xrXMLParser.exp b/libraries/Debug/Win32/xrXMLParser.exp
diff --git a/libraries/Debug/Win32/xrXMLParser.lib b/libraries/Debug/Win32/xrXMLParser.lib
diff --git a/src/xray/Luabind/Luabind.vcxproj b/src/xray/Luabind/Luabind.vcxproj
@@ -9,6 +9,14 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_for_Debug|Win32">
+      <Configuration>Release_for_Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_for_Debug|x64">
+      <Configuration>Release_for_Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -42,13 +50,27 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_for_Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_for_Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -61,20 +83,36 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_for_Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_for_Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <TargetName>luabind</TargetName>
     <OutDir>X:\binaries\$(Configuration)\$(Platform)\</OutDir>
     <IntDir>X:\intermediate\$(Configuration)\$(ProjectName)\$(Platform)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_for_Debug|Win32'">
+    <TargetName>luabind</TargetName>
+    <OutDir>X:\binaries\Debug\$(Platform)\</OutDir>
+    <IntDir>X:\intermediate\$(Configuration)\$(ProjectName)\$(Platform)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>luabind</TargetName>
     <OutDir>X:\binaries\$(Configuration)\$(Platform)\</OutDir>
     <IntDir>X:\intermediate\$(Configuration)\$(ProjectName)\$(Platform)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_for_Debug|x64'">
+    <TargetName>luabind</TargetName>
+    <OutDir>X:\binaries\$(Configuration)\$(Platform)\</OutDir>
+    <IntDir>X:\intermediate\$(Configuration)\$(ProjectName)\$(Platform)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <IntDir>X:\intermediate\$(Configuration)\$(ProjectName)\$(Platform)\</IntDir>
     <OutDir>X:\binaries\$(Configuration)\$(Platform)\</OutDir>
@@ -141,6 +179,34 @@
       <ImportLibrary>X:\libraries\$(Configuration)\$(Platform)\$(ProjectName).lib</ImportLibrary>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_for_Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>X:\src\3rd party\boost;X:\src\xray\LuaJIT\src;X:\src\xray\Luabind;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LUA_BUILD_AS_DLL;LUABIND_BUILDING;LUABIND_NO_ERROR_CHECKING;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FloatingPointModel>Fast</FloatingPointModel>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
+      <ExceptionHandling>false</ExceptionHandling>
+      <DisableSpecificWarnings>4995;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalLibraryDirectories>X:\libraries\Debug\$(Platform)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>xrCore.lib;lua5.1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ImportLibrary>X:\libraries\Debug\$(Platform)\$(ProjectName).lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -169,6 +235,34 @@
       <ImportLibrary>X:\libraries\$(Configuration)\$(Platform)\$(ProjectName).lib</ImportLibrary>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_for_Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>X:\src\3rd party\boost;X:\src\xray\LuaJIT\src;X:\src\xray\Luabind;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LUA_BUILD_AS_DLL;LUABIND_BUILDING;LUABIND_NO_ERROR_CHECKING;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FloatingPointModel>Fast</FloatingPointModel>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
+      <ExceptionHandling>false</ExceptionHandling>
+      <DisableSpecificWarnings>4995;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalLibraryDirectories>X:\libraries\$(Configuration)\$(Platform)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>xrCore.lib;lua51.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ImportLibrary>X:\libraries\$(Configuration)\$(Platform)\$(ProjectName).lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="src\class.cpp" />
     <ClCompile Include="src\class_info.cpp" />

diff --git a/src/xray/XRay_OLR.sln b/src/xray/XRay_OLR.sln
@@ -610,8 +610,8 @@ Global
 		{6FDBCDB3-D190-486D-BDAC-3C4AC527DA3B}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
 		{6FDBCDB3-D190-486D-BDAC-3C4AC527DA3B}.Debug_Dedicated|Win32.Build.0 = Debug|Win32
 		{6FDBCDB3-D190-486D-BDAC-3C4AC527DA3B}.Debug_Dedicated|x64.ActiveCfg = Debug|Win32
-		{6FDBCDB3-D190-486D-BDAC-3C4AC527DA3B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6FDBCDB3-D190-486D-BDAC-3C4AC527DA3B}.Debug|Win32.Build.0 = Debug|Win32
+		{6FDBCDB3-D190-486D-BDAC-3C4AC527DA3B}.Debug|Win32.ActiveCfg = Release_for_Debug|Win32
+		{6FDBCDB3-D190-486D-BDAC-3C4AC527DA3B}.Debug|Win32.Build.0 = Release_for_Debug|Win32
 		{6FDBCDB3-D190-486D-BDAC-3C4AC527DA3B}.Debug|x64.ActiveCfg = Debug|Win32
 		{6FDBCDB3-D190-486D-BDAC-3C4AC527DA3B}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32
 		{6FDBCDB3-D190-486D-BDAC-3C4AC527DA3B}.Mixed_Dedicated|Win32.Build.0 = Release|Win32