diff options
-rw-r--r-- | Lanes.vcxproj | 88 | ||||
-rw-r--r-- | deep_userdata_example/deep_userdata_example.vcxproj | 92 | ||||
-rw-r--r-- | src/universe.cpp | 4 | ||||
-rw-r--r-- | unit_tests/UnitTests.vcxproj | 48 |
4 files changed, 123 insertions, 109 deletions
diff --git a/Lanes.vcxproj b/Lanes.vcxproj index 1575789..98e1d37 100644 --- a/Lanes.vcxproj +++ b/Lanes.vcxproj | |||
@@ -576,7 +576,6 @@ | |||
576 | <DataExecutionPrevention> | 576 | <DataExecutionPrevention> |
577 | </DataExecutionPrevention> | 577 | </DataExecutionPrevention> |
578 | <TargetMachine>MachineX86</TargetMachine> | 578 | <TargetMachine>MachineX86</TargetMachine> |
579 | <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile> | ||
580 | <ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase> | 579 | <ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase> |
581 | <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> | 580 | <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> |
582 | </Link> | 581 | </Link> |
@@ -620,7 +619,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua51\ | |||
620 | <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> | 619 | <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> |
621 | </Link> | 620 | </Link> |
622 | <PostBuildEvent> | 621 | <PostBuildEvent> |
623 | <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\</Command> | 622 | <Command>xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\</Command> |
624 | <Message>Copy to LuaJIT</Message> | 623 | <Message>Copy to LuaJIT</Message> |
625 | </PostBuildEvent> | 624 | </PostBuildEvent> |
626 | </ItemDefinitionGroup> | 625 | </ItemDefinitionGroup> |
@@ -652,7 +651,6 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua51\ | |||
652 | <DataExecutionPrevention> | 651 | <DataExecutionPrevention> |
653 | </DataExecutionPrevention> | 652 | </DataExecutionPrevention> |
654 | <TargetMachine>MachineX86</TargetMachine> | 653 | <TargetMachine>MachineX86</TargetMachine> |
655 | <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile> | ||
656 | <ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase> | 654 | <ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase> |
657 | <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> | 655 | <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> |
658 | </Link> | 656 | </Link> |
@@ -735,7 +733,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua54\ | |||
735 | <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> | 733 | <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> |
736 | </Link> | 734 | </Link> |
737 | <PostBuildEvent> | 735 | <PostBuildEvent> |
738 | <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\MoonJIT\bin\$(Platform)\</Command> | 736 | <Command>xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\MoonJIT\bin\$(Platform)\</Command> |
739 | <Message>Copy to MoonJIT</Message> | 737 | <Message>Copy to MoonJIT</Message> |
740 | </PostBuildEvent> | 738 | </PostBuildEvent> |
741 | </ItemDefinitionGroup> | 739 | </ItemDefinitionGroup> |
@@ -745,7 +743,6 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua54\ | |||
745 | </Command> | 743 | </Command> |
746 | </PreBuildEvent> | 744 | </PreBuildEvent> |
747 | <ClCompile> | 745 | <ClCompile> |
748 | <Optimization>Disabled</Optimization> | ||
749 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua53\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 746 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua53\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
750 | <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 747 | <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
751 | <MinimalRebuild>false</MinimalRebuild> | 748 | <MinimalRebuild>false</MinimalRebuild> |
@@ -774,7 +771,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua54\ | |||
774 | </Link> | 771 | </Link> |
775 | <PostBuildEvent> | 772 | <PostBuildEvent> |
776 | <Command>xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\ | 773 | <Command>xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\ |
777 | xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua513\bin\$(Platform)\Release\ | 774 | xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\ |
778 | </Command> | 775 | </Command> |
779 | <Message>Copy to Lua 5.3</Message> | 776 | <Message>Copy to Lua 5.3</Message> |
780 | </PostBuildEvent> | 777 | </PostBuildEvent> |
@@ -785,7 +782,6 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua513 | |||
785 | </Command> | 782 | </Command> |
786 | </PreBuildEvent> | 783 | </PreBuildEvent> |
787 | <ClCompile> | 784 | <ClCompile> |
788 | <Optimization>Disabled</Optimization> | ||
789 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua54\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 785 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua54\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
790 | <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 786 | <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
791 | <PrecompiledHeader>Use</PrecompiledHeader> | 787 | <PrecompiledHeader>Use</PrecompiledHeader> |
@@ -880,7 +876,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua51\ | |||
880 | </DataExecutionPrevention> | 876 | </DataExecutionPrevention> |
881 | </Link> | 877 | </Link> |
882 | <PostBuildEvent> | 878 | <PostBuildEvent> |
883 | <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\</Command> | 879 | <Command>xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\</Command> |
884 | <Message>Copy to LuaJIT</Message> | 880 | <Message>Copy to LuaJIT</Message> |
885 | </PostBuildEvent> | 881 | </PostBuildEvent> |
886 | </ItemDefinitionGroup> | 882 | </ItemDefinitionGroup> |
@@ -980,7 +976,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua54\ | |||
980 | </DataExecutionPrevention> | 976 | </DataExecutionPrevention> |
981 | </Link> | 977 | </Link> |
982 | <PostBuildEvent> | 978 | <PostBuildEvent> |
983 | <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\MoonJIT\bin\$(Platform)\</Command> | 979 | <Command>xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\MoonJIT\bin\$(Platform)\</Command> |
984 | <Message>Copy to MoonJIT</Message> | 980 | <Message>Copy to MoonJIT</Message> |
985 | </PostBuildEvent> | 981 | </PostBuildEvent> |
986 | </ItemDefinitionGroup> | 982 | </ItemDefinitionGroup> |
@@ -1014,7 +1010,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua54\ | |||
1014 | </Link> | 1010 | </Link> |
1015 | <PostBuildEvent> | 1011 | <PostBuildEvent> |
1016 | <Command>xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\ | 1012 | <Command>xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\ |
1017 | xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua513\bin\$(Platform)\Release\ | 1013 | xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\ |
1018 | </Command> | 1014 | </Command> |
1019 | <Message>Copy to Lua 5.3</Message> | 1015 | <Message>Copy to Lua 5.3</Message> |
1020 | </PostBuildEvent> | 1016 | </PostBuildEvent> |
@@ -1025,7 +1021,6 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua513 | |||
1025 | </Command> | 1021 | </Command> |
1026 | </PreBuildEvent> | 1022 | </PreBuildEvent> |
1027 | <ClCompile> | 1023 | <ClCompile> |
1028 | <Optimization>Full</Optimization> | ||
1029 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua54\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 1024 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua54\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
1030 | <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 1025 | <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
1031 | <PrecompiledHeader>Use</PrecompiledHeader> | 1026 | <PrecompiledHeader>Use</PrecompiledHeader> |
@@ -1082,7 +1077,6 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua54\ | |||
1082 | <DataExecutionPrevention> | 1077 | <DataExecutionPrevention> |
1083 | </DataExecutionPrevention> | 1078 | </DataExecutionPrevention> |
1084 | <TargetMachine>MachineX86</TargetMachine> | 1079 | <TargetMachine>MachineX86</TargetMachine> |
1085 | <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile> | ||
1086 | <ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase> | 1080 | <ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase> |
1087 | <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> | 1081 | <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> |
1088 | </Link> | 1082 | </Link> |
@@ -1155,7 +1149,6 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua52\ | |||
1155 | <DataExecutionPrevention> | 1149 | <DataExecutionPrevention> |
1156 | </DataExecutionPrevention> | 1150 | </DataExecutionPrevention> |
1157 | <TargetMachine>MachineX86</TargetMachine> | 1151 | <TargetMachine>MachineX86</TargetMachine> |
1158 | <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile> | ||
1159 | <ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase> | 1152 | <ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase> |
1160 | <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> | 1153 | <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> |
1161 | <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> | 1154 | <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> |
@@ -1443,11 +1436,10 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua52\ | |||
1443 | <Message Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'">Copy lanes.lua to Lua 5.1</Message> | 1436 | <Message Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'">Copy lanes.lua to Lua 5.1</Message> |
1444 | <Message Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT|Win32'">Copy lanes.lua to LuaJIT</Message> | 1437 | <Message Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT|Win32'">Copy lanes.lua to LuaJIT</Message> |
1445 | <Message Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'">Copy lanes.lua to Lua 5.3</Message> | 1438 | <Message Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'">Copy lanes.lua to Lua 5.3</Message> |
1446 | <Message Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">Copy lanes.lua to framework</Message> | 1439 | <Message Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">Copy lanes.lua to Lua 5.4</Message> |
1447 | <Message Condition="'$(Configuration)|$(Platform)'=='Debug MoonJIT|Win32'">Copy lanes.lua to MoonJIT</Message> | 1440 | <Message Condition="'$(Configuration)|$(Platform)'=='Debug MoonJIT|Win32'">Copy lanes.lua to MoonJIT</Message> |
1448 | <Message Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'"> | 1441 | <Message Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'">Copy lanes.lua to Lua 5.3</Message> |
1449 | </Message> | 1442 | <Message Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">Copy lanes.lua to Lua 5.4</Message> |
1450 | <Message Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">Copy lanes.lua to framework</Message> | ||
1451 | <Message Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'">Copy lanes.lua to Lua 5.1</Message> | 1443 | <Message Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'">Copy lanes.lua to Lua 5.1</Message> |
1452 | <Message Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT|x64'">Copy lanes.lua to LuaJIT</Message> | 1444 | <Message Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT|x64'">Copy lanes.lua to LuaJIT</Message> |
1453 | <Message Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">Copy lanes.lua to Lua 5.3</Message> | 1445 | <Message Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">Copy lanes.lua to Lua 5.3</Message> |
@@ -1457,31 +1449,29 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua52\ | |||
1457 | <Message Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">Copy lanes.lua to Lua 5.4</Message> | 1449 | <Message Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">Copy lanes.lua to Lua 5.4</Message> |
1458 | <Message Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'">Copy lanes.lua to Lua 5.2</Message> | 1450 | <Message Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'">Copy lanes.lua to Lua 5.2</Message> |
1459 | <Message Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'">Copy lanes.lua to Lua 5.2</Message> | 1451 | <Message Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'">Copy lanes.lua to Lua 5.2</Message> |
1460 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'">xcopy /R /F /Y %(FullPath) $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\</Command> | 1452 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'">xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\</Command> |
1461 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT|Win32'">xcopy /R /F /Y %(FullPath) $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\lua</Command> | 1453 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT|Win32'">xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\lua</Command> |
1462 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'">xcopy /R /F /Y %(FullPath) $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\</Command> | 1454 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'">xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\</Command> |
1463 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">xcopy /R /F /Y %(FullPath) $(SolutionDir)..\framework\</Command> | 1455 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\</Command> |
1464 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug MoonJIT|Win32'">xcopy /R /F /Y %(FullPath) $(SolutionDir)..\MoonJIT\bin\$(Platform)\lua</Command> | 1456 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug MoonJIT|Win32'">xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\MoonJIT\bin\$(Platform)\lua</Command> |
1465 | <Command Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'"> | 1457 | <Command Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'">xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\</Command> |
1466 | </Command> | 1458 | <Command Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\</Command> |
1467 | <Command Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">xcopy /R /F /Y %(FullPath) $(SolutionDir)..\framework\</Command> | 1459 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'">xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\</Command> |
1468 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'">xcopy /R /F /Y %(FullPath) $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\</Command> | 1460 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT|x64'">xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\lua</Command> |
1469 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT|x64'">xcopy /R /F /Y %(FullPath) $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\lua</Command> | 1461 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\</Command> |
1470 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">xcopy /R /F /Y %(FullPath) $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\</Command> | 1462 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\</Command> |
1471 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">xcopy /R /F /Y %(FullPath) $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\</Command> | 1463 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug MoonJIT|x64'">xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\MoonJIT\bin\$(Platform)\lua</Command> |
1472 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug MoonJIT|x64'">xcopy /R /F /Y %(FullPath) $(SolutionDir)..\MoonJIT\bin\$(Platform)\lua</Command> | 1464 | <Command Condition="'$(Configuration)|$(Platform)'=='Release 5.3|x64'">xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\</Command> |
1473 | <Command Condition="'$(Configuration)|$(Platform)'=='Release 5.3|x64'">xcopy /R /F /Y %(FullPath) $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\</Command> | 1465 | <Command Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\</Command> |
1474 | <Command Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">xcopy /R /F /Y %(FullPath) $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\</Command> | 1466 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'">xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua2\bin\$(Platform)\Debug\</Command> |
1475 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'">xcopy /R /F /Y %(FullPath) $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\</Command> | 1467 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'">xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua2\bin\$(Platform)\Debug\</Command> |
1476 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'">xcopy /R /F /Y %(FullPath) $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\</Command> | ||
1477 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'">$(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\%(Filename)%(Extension)</Outputs> | 1468 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'">$(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\%(Filename)%(Extension)</Outputs> |
1478 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT|Win32'">$(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\lua\%(Filename)%(Extension)</Outputs> | 1469 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT|Win32'">$(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\lua\%(Filename)%(Extension)</Outputs> |
1479 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'">$(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\%(Filename)%(Extension)</Outputs> | 1470 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'">$(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\%(Filename)%(Extension)</Outputs> |
1480 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">$(SolutionDir)..\framework\%(Filename)%(Extension)</Outputs> | 1471 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">$(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\%(Filename)%(Extension)</Outputs> |
1481 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug MoonJIT|Win32'">$(SolutionDir)..\MoonJIT\bin\$(Platform)\lua\%(Filename)%(Extension)</Outputs> | 1472 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug MoonJIT|Win32'">$(SolutionDir)..\MoonJIT\bin\$(Platform)\lua\%(Filename)%(Extension)</Outputs> |
1482 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'"> | 1473 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'">$(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\%(Filename)%(Extension)</Outputs> |
1483 | </Outputs> | 1474 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">$(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\%(Filename)%(Extension)</Outputs> |
1484 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">$(SolutionDir)..\framework\%(Filename)%(Extension)</Outputs> | ||
1485 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'">$(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\%(Filename)%(Extension)</Outputs> | 1475 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'">$(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\%(Filename)%(Extension)</Outputs> |
1486 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT|x64'">$(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\lua\%(Filename)%(Extension)</Outputs> | 1476 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT|x64'">$(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\lua\%(Filename)%(Extension)</Outputs> |
1487 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">$(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\%(Filename)%(Extension)</Outputs> | 1477 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">$(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\%(Filename)%(Extension)</Outputs> |
@@ -1491,23 +1481,17 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua52\ | |||
1491 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">$(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\%(Filename)%(Extension)</Outputs> | 1481 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">$(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\%(Filename)%(Extension)</Outputs> |
1492 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'">$(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\%(Filename)%(Extension)</Outputs> | 1482 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'">$(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\%(Filename)%(Extension)</Outputs> |
1493 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'">$(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\%(Filename)%(Extension)</Outputs> | 1483 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'">$(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\%(Filename)%(Extension)</Outputs> |
1494 | <Message Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Win32'"> | 1484 | <Message Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Win32'">Copy lanes.lua to Lua 5.1</Message> |
1495 | </Message> | ||
1496 | <Message Condition="'$(Configuration)|$(Platform)'=='Release 5.1|x64'">Copy lanes.lua to Lua 5.1</Message> | 1485 | <Message Condition="'$(Configuration)|$(Platform)'=='Release 5.1|x64'">Copy lanes.lua to Lua 5.1</Message> |
1497 | <Message Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Win32'"> | 1486 | <Message Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Win32'">Copy lanes.lua to Lua 5.2</Message> |
1498 | </Message> | ||
1499 | <Message Condition="'$(Configuration)|$(Platform)'=='Release 5.2|x64'">Copy lanes.lua to Lua 5.2</Message> | 1487 | <Message Condition="'$(Configuration)|$(Platform)'=='Release 5.2|x64'">Copy lanes.lua to Lua 5.2</Message> |
1500 | <Command Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Win32'"> | 1488 | <Command Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Win32'">xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\</Command> |
1501 | </Command> | 1489 | <Command Condition="'$(Configuration)|$(Platform)'=='Release 5.1|x64'">xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\</Command> |
1502 | <Command Condition="'$(Configuration)|$(Platform)'=='Release 5.1|x64'">xcopy /R /F /Y %(FullPath) $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\</Command> | 1490 | <Command Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Win32'">xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\</Command> |
1503 | <Command Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Win32'"> | 1491 | <Command Condition="'$(Configuration)|$(Platform)'=='Release 5.2|x64'">xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\</Command> |
1504 | </Command> | 1492 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Win32'">$(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\%(Filename)%(Extension)</Outputs> |
1505 | <Command Condition="'$(Configuration)|$(Platform)'=='Release 5.2|x64'">xcopy /R /F /Y %(FullPath) $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\</Command> | ||
1506 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Win32'"> | ||
1507 | </Outputs> | ||
1508 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release 5.1|x64'">$(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\%(Filename)%(Extension)</Outputs> | 1493 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release 5.1|x64'">$(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\%(Filename)%(Extension)</Outputs> |
1509 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Win32'"> | 1494 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Win32'">$(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\%(Filename)%(Extension)</Outputs> |
1510 | </Outputs> | ||
1511 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release 5.2|x64'">$(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\%(Filename)%(Extension)</Outputs> | 1495 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release 5.2|x64'">$(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\%(Filename)%(Extension)</Outputs> |
1512 | <BuildInParallel Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'"> | 1496 | <BuildInParallel Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'"> |
1513 | </BuildInParallel> | 1497 | </BuildInParallel> |
diff --git a/deep_userdata_example/deep_userdata_example.vcxproj b/deep_userdata_example/deep_userdata_example.vcxproj index ec40f30..fbfcec3 100644 --- a/deep_userdata_example/deep_userdata_example.vcxproj +++ b/deep_userdata_example/deep_userdata_example.vcxproj | |||
@@ -178,14 +178,14 @@ | |||
178 | <CharacterSet>MultiByte</CharacterSet> | 178 | <CharacterSet>MultiByte</CharacterSet> |
179 | </PropertyGroup> | 179 | </PropertyGroup> |
180 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'" Label="Configuration"> | 180 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'" Label="Configuration"> |
181 | <ConfigurationType>Application</ConfigurationType> | 181 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
182 | <UseDebugLibraries>false</UseDebugLibraries> | 182 | <UseDebugLibraries>false</UseDebugLibraries> |
183 | <PlatformToolset>v143</PlatformToolset> | 183 | <PlatformToolset>v143</PlatformToolset> |
184 | <WholeProgramOptimization>true</WholeProgramOptimization> | 184 | <WholeProgramOptimization>true</WholeProgramOptimization> |
185 | <CharacterSet>MultiByte</CharacterSet> | 185 | <CharacterSet>MultiByte</CharacterSet> |
186 | </PropertyGroup> | 186 | </PropertyGroup> |
187 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'" Label="Configuration"> | 187 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'" Label="Configuration"> |
188 | <ConfigurationType>Application</ConfigurationType> | 188 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
189 | <UseDebugLibraries>false</UseDebugLibraries> | 189 | <UseDebugLibraries>false</UseDebugLibraries> |
190 | <PlatformToolset>v143</PlatformToolset> | 190 | <PlatformToolset>v143</PlatformToolset> |
191 | <WholeProgramOptimization>true</WholeProgramOptimization> | 191 | <WholeProgramOptimization>true</WholeProgramOptimization> |
@@ -437,6 +437,14 @@ | |||
437 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> | 437 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> |
438 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 438 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
439 | </PropertyGroup> | 439 | </PropertyGroup> |
440 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'"> | ||
441 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> | ||
442 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | ||
443 | </PropertyGroup> | ||
444 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'"> | ||
445 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | ||
446 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> | ||
447 | </PropertyGroup> | ||
440 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.3|x64'"> | 448 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.3|x64'"> |
441 | <ClCompile> | 449 | <ClCompile> |
442 | <WarningLevel>Level3</WarningLevel> | 450 | <WarningLevel>Level3</WarningLevel> |
@@ -455,7 +463,7 @@ | |||
455 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release</AdditionalLibraryDirectories> | 463 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release</AdditionalLibraryDirectories> |
456 | </Link> | 464 | </Link> |
457 | <PostBuildEvent> | 465 | <PostBuildEvent> |
458 | <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\</Command> | 466 | <Command>xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\</Command> |
459 | <Message>Copy to Lua 5.3</Message> | 467 | <Message>Copy to Lua 5.3</Message> |
460 | </PostBuildEvent> | 468 | </PostBuildEvent> |
461 | </ItemDefinitionGroup> | 469 | </ItemDefinitionGroup> |
@@ -477,7 +485,7 @@ | |||
477 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release</AdditionalLibraryDirectories> | 485 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release</AdditionalLibraryDirectories> |
478 | </Link> | 486 | </Link> |
479 | <PostBuildEvent> | 487 | <PostBuildEvent> |
480 | <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\</Command> | 488 | <Command>xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\</Command> |
481 | <Message>Copy to Lua 5.4</Message> | 489 | <Message>Copy to Lua 5.4</Message> |
482 | </PostBuildEvent> | 490 | </PostBuildEvent> |
483 | </ItemDefinitionGroup> | 491 | </ItemDefinitionGroup> |
@@ -493,8 +501,8 @@ | |||
493 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | 501 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
494 | </ClCompile> | 502 | </ClCompile> |
495 | <PostBuildEvent> | 503 | <PostBuildEvent> |
496 | <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\</Command> | 504 | <Command>xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\</Command> |
497 | <Message>Lua 5.3</Message> | 505 | <Message>Copy to Lua 5.3</Message> |
498 | </PostBuildEvent> | 506 | </PostBuildEvent> |
499 | <Link> | 507 | <Link> |
500 | <AdditionalDependencies>lua53.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> | 508 | <AdditionalDependencies>lua53.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
@@ -513,12 +521,12 @@ | |||
513 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | 521 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
514 | </ClCompile> | 522 | </ClCompile> |
515 | <PostBuildEvent> | 523 | <PostBuildEvent> |
516 | <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\</Command> | 524 | <Command>xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\</Command> |
517 | <Message>Copy to Lua 5.2</Message> | 525 | <Message>Copy to Lua 5.1</Message> |
518 | </PostBuildEvent> | 526 | </PostBuildEvent> |
519 | <Link> | 527 | <Link> |
520 | <AdditionalDependencies>lua52.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> | 528 | <AdditionalDependencies>lua51.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
521 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug</AdditionalLibraryDirectories> | 529 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug</AdditionalLibraryDirectories> |
522 | </Link> | 530 | </Link> |
523 | </ItemDefinitionGroup> | 531 | </ItemDefinitionGroup> |
524 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Win32'"> | 532 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Win32'"> |
@@ -533,12 +541,12 @@ | |||
533 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | 541 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
534 | </ClCompile> | 542 | </ClCompile> |
535 | <PostBuildEvent> | 543 | <PostBuildEvent> |
536 | <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\</Command> | 544 | <Command>xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\</Command> |
537 | <Message>Copy to Lua 5.2</Message> | 545 | <Message>Copy to Lua 5.1</Message> |
538 | </PostBuildEvent> | 546 | </PostBuildEvent> |
539 | <Link> | 547 | <Link> |
540 | <AdditionalDependencies>lua52.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> | 548 | <AdditionalDependencies>lua51.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
541 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug</AdditionalLibraryDirectories> | 549 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release</AdditionalLibraryDirectories> |
542 | </Link> | 550 | </Link> |
543 | </ItemDefinitionGroup> | 551 | </ItemDefinitionGroup> |
544 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'"> | 552 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'"> |
@@ -553,12 +561,12 @@ | |||
553 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | 561 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
554 | </ClCompile> | 562 | </ClCompile> |
555 | <PostBuildEvent> | 563 | <PostBuildEvent> |
556 | <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\</Command> | 564 | <Command>xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\</Command> |
557 | <Message>Copy to Lua 5.2</Message> | 565 | <Message>Copy to Lua 5.2</Message> |
558 | </PostBuildEvent> | 566 | </PostBuildEvent> |
559 | <Link> | 567 | <Link> |
560 | <AdditionalDependencies>lua51.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> | 568 | <AdditionalDependencies>lua52.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
561 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug</AdditionalLibraryDirectories> | 569 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug</AdditionalLibraryDirectories> |
562 | </Link> | 570 | </Link> |
563 | </ItemDefinitionGroup> | 571 | </ItemDefinitionGroup> |
564 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Win32'"> | 572 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Win32'"> |
@@ -573,12 +581,12 @@ | |||
573 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | 581 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
574 | </ClCompile> | 582 | </ClCompile> |
575 | <PostBuildEvent> | 583 | <PostBuildEvent> |
576 | <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\</Command> | 584 | <Command>xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\</Command> |
577 | <Message>Copy to Lua 5.2</Message> | 585 | <Message>Copy to Lua 5.2</Message> |
578 | </PostBuildEvent> | 586 | </PostBuildEvent> |
579 | <Link> | 587 | <Link> |
580 | <AdditionalDependencies>lua51.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> | 588 | <AdditionalDependencies>lua52.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
581 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug</AdditionalLibraryDirectories> | 589 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release</AdditionalLibraryDirectories> |
582 | </Link> | 590 | </Link> |
583 | </ItemDefinitionGroup> | 591 | </ItemDefinitionGroup> |
584 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT|Win32'"> | 592 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT|Win32'"> |
@@ -594,8 +602,8 @@ | |||
594 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | 602 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
595 | </ClCompile> | 603 | </ClCompile> |
596 | <PostBuildEvent> | 604 | <PostBuildEvent> |
597 | <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\LuaJIT-2.0.5\bin\$(Platform)\</Command> | 605 | <Command>xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\</Command> |
598 | <Message>Copy to LuaJITGIT</Message> | 606 | <Message>Copy to LuaJIT</Message> |
599 | </PostBuildEvent> | 607 | </PostBuildEvent> |
600 | <Link> | 608 | <Link> |
601 | <AdditionalDependencies>lua51.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> | 609 | <AdditionalDependencies>lua51.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
@@ -614,8 +622,8 @@ | |||
614 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | 622 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
615 | </ClCompile> | 623 | </ClCompile> |
616 | <PostBuildEvent> | 624 | <PostBuildEvent> |
617 | <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\framework\</Command> | 625 | <Command>xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\</Command> |
618 | <Message>Copy to framework</Message> | 626 | <Message>Copy to Lua 5.4</Message> |
619 | </PostBuildEvent> | 627 | </PostBuildEvent> |
620 | <Link> | 628 | <Link> |
621 | <AdditionalDependencies>lua54.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> | 629 | <AdditionalDependencies>lua54.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
@@ -634,7 +642,7 @@ | |||
634 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | 642 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
635 | </ClCompile> | 643 | </ClCompile> |
636 | <PostBuildEvent> | 644 | <PostBuildEvent> |
637 | <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\MoonJIT\bin\$(Platform)\</Command> | 645 | <Command>xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\MoonJIT\bin\$(Platform)\</Command> |
638 | <Message>Copy to MoonJIT</Message> | 646 | <Message>Copy to MoonJIT</Message> |
639 | </PostBuildEvent> | 647 | </PostBuildEvent> |
640 | <Link> | 648 | <Link> |
@@ -654,7 +662,7 @@ | |||
654 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | 662 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
655 | </ClCompile> | 663 | </ClCompile> |
656 | <PostBuildEvent> | 664 | <PostBuildEvent> |
657 | <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\</Command> | 665 | <Command>xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\</Command> |
658 | <Message>Copy to Lua 5.3</Message> | 666 | <Message>Copy to Lua 5.3</Message> |
659 | </PostBuildEvent> | 667 | </PostBuildEvent> |
660 | <Link> | 668 | <Link> |
@@ -674,7 +682,7 @@ | |||
674 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | 682 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
675 | </ClCompile> | 683 | </ClCompile> |
676 | <PostBuildEvent> | 684 | <PostBuildEvent> |
677 | <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\</Command> | 685 | <Command>xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\</Command> |
678 | <Message>Copy to Lua 5.1</Message> | 686 | <Message>Copy to Lua 5.1</Message> |
679 | </PostBuildEvent> | 687 | </PostBuildEvent> |
680 | <Link> | 688 | <Link> |
@@ -694,12 +702,12 @@ | |||
694 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | 702 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
695 | </ClCompile> | 703 | </ClCompile> |
696 | <PostBuildEvent> | 704 | <PostBuildEvent> |
697 | <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\</Command> | 705 | <Command>xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\</Command> |
698 | <Message>Copy to Lua 5.1</Message> | 706 | <Message>Copy to Lua 5.1</Message> |
699 | </PostBuildEvent> | 707 | </PostBuildEvent> |
700 | <Link> | 708 | <Link> |
701 | <AdditionalDependencies>lua51.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> | 709 | <AdditionalDependencies>lua51.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
702 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug</AdditionalLibraryDirectories> | 710 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release</AdditionalLibraryDirectories> |
703 | </Link> | 711 | </Link> |
704 | </ItemDefinitionGroup> | 712 | </ItemDefinitionGroup> |
705 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'"> | 713 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'"> |
@@ -714,7 +722,7 @@ | |||
714 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | 722 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
715 | </ClCompile> | 723 | </ClCompile> |
716 | <PostBuildEvent> | 724 | <PostBuildEvent> |
717 | <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\</Command> | 725 | <Command>xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\</Command> |
718 | <Message>Copy to Lua 5.2</Message> | 726 | <Message>Copy to Lua 5.2</Message> |
719 | </PostBuildEvent> | 727 | </PostBuildEvent> |
720 | <Link> | 728 | <Link> |
@@ -734,12 +742,12 @@ | |||
734 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | 742 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
735 | </ClCompile> | 743 | </ClCompile> |
736 | <PostBuildEvent> | 744 | <PostBuildEvent> |
737 | <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\</Command> | 745 | <Command>xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\</Command> |
738 | <Message>Copy to Lua 5.2</Message> | 746 | <Message>Copy to Lua 5.2</Message> |
739 | </PostBuildEvent> | 747 | </PostBuildEvent> |
740 | <Link> | 748 | <Link> |
741 | <AdditionalDependencies>lua52.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> | 749 | <AdditionalDependencies>lua52.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
742 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug</AdditionalLibraryDirectories> | 750 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release</AdditionalLibraryDirectories> |
743 | </Link> | 751 | </Link> |
744 | </ItemDefinitionGroup> | 752 | </ItemDefinitionGroup> |
745 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT|x64'"> | 753 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT|x64'"> |
@@ -754,8 +762,8 @@ | |||
754 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | 762 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
755 | </ClCompile> | 763 | </ClCompile> |
756 | <PostBuildEvent> | 764 | <PostBuildEvent> |
757 | <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\LuaJIT-GIT\bin\$(Platform)\</Command> | 765 | <Command>xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\</Command> |
758 | <Message>Copy to LuaJITGIT</Message> | 766 | <Message>Copy to LuaJIT</Message> |
759 | </PostBuildEvent> | 767 | </PostBuildEvent> |
760 | <Link> | 768 | <Link> |
761 | <AdditionalDependencies>lua51.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> | 769 | <AdditionalDependencies>lua51.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
@@ -774,7 +782,7 @@ | |||
774 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | 782 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
775 | </ClCompile> | 783 | </ClCompile> |
776 | <PostBuildEvent> | 784 | <PostBuildEvent> |
777 | <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\</Command> | 785 | <Command>xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\</Command> |
778 | <Message>Copy to Lua 5.4</Message> | 786 | <Message>Copy to Lua 5.4</Message> |
779 | </PostBuildEvent> | 787 | </PostBuildEvent> |
780 | <Link> | 788 | <Link> |
@@ -794,7 +802,7 @@ | |||
794 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | 802 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
795 | </ClCompile> | 803 | </ClCompile> |
796 | <PostBuildEvent> | 804 | <PostBuildEvent> |
797 | <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\MoonJIT\bin\$(Platform)\</Command> | 805 | <Command>xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\MoonJIT\bin\$(Platform)\</Command> |
798 | <Message>Copy to MoonJIT</Message> | 806 | <Message>Copy to MoonJIT</Message> |
799 | </PostBuildEvent> | 807 | </PostBuildEvent> |
800 | <Link> | 808 | <Link> |
@@ -820,6 +828,12 @@ | |||
820 | <AdditionalDependencies>lua53.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> | 828 | <AdditionalDependencies>lua53.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
821 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release</AdditionalLibraryDirectories> | 829 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release</AdditionalLibraryDirectories> |
822 | </Link> | 830 | </Link> |
831 | <PostBuildEvent> | ||
832 | <Command>xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\</Command> | ||
833 | </PostBuildEvent> | ||
834 | <PostBuildEvent> | ||
835 | <Message>Copy to Lua 5.3</Message> | ||
836 | </PostBuildEvent> | ||
823 | </ItemDefinitionGroup> | 837 | </ItemDefinitionGroup> |
824 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'"> | 838 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'"> |
825 | <ClCompile> | 839 | <ClCompile> |
@@ -839,6 +853,12 @@ | |||
839 | <AdditionalDependencies>lua54.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> | 853 | <AdditionalDependencies>lua54.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
840 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release</AdditionalLibraryDirectories> | 854 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release</AdditionalLibraryDirectories> |
841 | </Link> | 855 | </Link> |
856 | <PostBuildEvent> | ||
857 | <Command>xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\</Command> | ||
858 | </PostBuildEvent> | ||
859 | <PostBuildEvent> | ||
860 | <Message>Copy to Lua 5.4</Message> | ||
861 | </PostBuildEvent> | ||
842 | </ItemDefinitionGroup> | 862 | </ItemDefinitionGroup> |
843 | <ItemGroup> | 863 | <ItemGroup> |
844 | <ClCompile Include="..\src\compat.cpp" /> | 864 | <ClCompile Include="..\src\compat.cpp" /> |
diff --git a/src/universe.cpp b/src/universe.cpp index db00b72..89ad02a 100644 --- a/src/universe.cpp +++ b/src/universe.cpp | |||
@@ -451,7 +451,9 @@ int Universe::UniverseGC(lua_State* const L_) | |||
451 | } else { | 451 | } else { |
452 | // take the value returned by the finalizer (or our default message) and throw it as an error | 452 | // take the value returned by the finalizer (or our default message) and throw it as an error |
453 | // since we are inside Lua's GCTM, it will be propagated through the warning system (Lua 5.4) or swallowed silently | 453 | // since we are inside Lua's GCTM, it will be propagated through the warning system (Lua 5.4) or swallowed silently |
454 | raise_lua_error(L_); | 454 | // IMPORTANT: lua_error() is used here instead of the wrapper raise_lua_error() to circumvent what looks like a MSVC compiler bug |
455 | // that manifests as a crash inside ntdll!longjmp() function, in optimized builds only | ||
456 | lua_error(L_); | ||
455 | } | 457 | } |
456 | } | 458 | } |
457 | 459 | ||
diff --git a/unit_tests/UnitTests.vcxproj b/unit_tests/UnitTests.vcxproj index 013a84f..7da7155 100644 --- a/unit_tests/UnitTests.vcxproj +++ b/unit_tests/UnitTests.vcxproj | |||
@@ -155,84 +155,84 @@ | |||
155 | <ImportGroup Label="PropertySheets" /> | 155 | <ImportGroup Label="PropertySheets" /> |
156 | <PropertyGroup Label="UserMacros" /> | 156 | <PropertyGroup Label="UserMacros" /> |
157 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'"> | 157 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'"> |
158 | <OutDir>$(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\</OutDir> | 158 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> |
159 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 159 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
160 | </PropertyGroup> | 160 | </PropertyGroup> |
161 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'"> | 161 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'"> |
162 | <OutDir>$(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\</OutDir> | 162 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> |
163 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 163 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
164 | </PropertyGroup> | 164 | </PropertyGroup> |
165 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'"> | 165 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'"> |
166 | <OutDir>$(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\</OutDir> | 166 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> |
167 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 167 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
168 | </PropertyGroup> | 168 | </PropertyGroup> |
169 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'"> | 169 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'"> |
170 | <OutDir>$(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\</OutDir> | 170 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> |
171 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 171 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
172 | </PropertyGroup> | 172 | </PropertyGroup> |
173 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Win32'"> | 173 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Win32'"> |
174 | <OutDir>$(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\</OutDir> | 174 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> |
175 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 175 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
176 | </PropertyGroup> | 176 | </PropertyGroup> |
177 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'"> | 177 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'"> |
178 | <OutDir>$(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\</OutDir> | 178 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> |
179 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 179 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
180 | </PropertyGroup> | 180 | </PropertyGroup> |
181 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Win32'"> | 181 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Win32'"> |
182 | <OutDir>$(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\</OutDir> | 182 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> |
183 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 183 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
184 | </PropertyGroup> | 184 | </PropertyGroup> |
185 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT|Win32'"> | 185 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT|Win32'"> |
186 | <OutDir>$(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\</OutDir> | 186 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> |
187 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 187 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
188 | </PropertyGroup> | 188 | </PropertyGroup> |
189 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MoonJIT|Win32'"> | 189 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MoonJIT|Win32'"> |
190 | <OutDir>$(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\</OutDir> | 190 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> |
191 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 191 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
192 | </PropertyGroup> | 192 | </PropertyGroup> |
193 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'"> | 193 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'"> |
194 | <OutDir>$(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\</OutDir> | 194 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> |
195 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 195 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
196 | </PropertyGroup> | 196 | </PropertyGroup> |
197 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'"> | 197 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'"> |
198 | <OutDir>$(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\</OutDir> | 198 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> |
199 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 199 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
200 | </PropertyGroup> | 200 | </PropertyGroup> |
201 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Prospero'" /> | 201 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Prospero'" /> |
202 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'"> | 202 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'"> |
203 | <OutDir>$(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\</OutDir> | 203 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> |
204 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 204 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
205 | </PropertyGroup> | 205 | </PropertyGroup> |
206 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.3|x64'"> | 206 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.3|x64'"> |
207 | <OutDir>$(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\</OutDir> | 207 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> |
208 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 208 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
209 | </PropertyGroup> | 209 | </PropertyGroup> |
210 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'"> | 210 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'"> |
211 | <OutDir>$(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\</OutDir> | 211 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> |
212 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 212 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
213 | </PropertyGroup> | 213 | </PropertyGroup> |
214 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.2|x64'"> | 214 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.2|x64'"> |
215 | <OutDir>$(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\</OutDir> | 215 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> |
216 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 216 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
217 | </PropertyGroup> | 217 | </PropertyGroup> |
218 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'"> | 218 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'"> |
219 | <OutDir>$(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\</OutDir> | 219 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> |
220 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 220 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
221 | </PropertyGroup> | 221 | </PropertyGroup> |
222 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.1|x64'"> | 222 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.1|x64'"> |
223 | <OutDir>$(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\</OutDir> | 223 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> |
224 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 224 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
225 | </PropertyGroup> | 225 | </PropertyGroup> |
226 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT|x64'"> | 226 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT|x64'"> |
227 | <OutDir>$(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\</OutDir> | 227 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> |
228 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 228 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
229 | </PropertyGroup> | 229 | </PropertyGroup> |
230 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MoonJIT|x64'"> | 230 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MoonJIT|x64'"> |
231 | <OutDir>$(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\</OutDir> | 231 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> |
232 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 232 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
233 | </PropertyGroup> | 233 | </PropertyGroup> |
234 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'"> | 234 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'"> |
235 | <OutDir>$(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\</OutDir> | 235 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> |
236 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 236 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
237 | </PropertyGroup> | 237 | </PropertyGroup> |
238 | <ItemDefinitionGroup /> | 238 | <ItemDefinitionGroup /> |
@@ -252,6 +252,7 @@ | |||
252 | <GenerateDebugInformation>true</GenerateDebugInformation> | 252 | <GenerateDebugInformation>true</GenerateDebugInformation> |
253 | <SubSystem>Console</SubSystem> | 253 | <SubSystem>Console</SubSystem> |
254 | <AdditionalDependencies>lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | 254 | <AdditionalDependencies>lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> |
255 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug</AdditionalLibraryDirectories> | ||
255 | </Link> | 256 | </Link> |
256 | </ItemDefinitionGroup> | 257 | </ItemDefinitionGroup> |
257 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'"> | 258 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'"> |
@@ -270,6 +271,7 @@ | |||
270 | <GenerateDebugInformation>true</GenerateDebugInformation> | 271 | <GenerateDebugInformation>true</GenerateDebugInformation> |
271 | <SubSystem>Console</SubSystem> | 272 | <SubSystem>Console</SubSystem> |
272 | <AdditionalDependencies>lua53.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | 273 | <AdditionalDependencies>lua53.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> |
274 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug</AdditionalLibraryDirectories> | ||
273 | </Link> | 275 | </Link> |
274 | </ItemDefinitionGroup> | 276 | </ItemDefinitionGroup> |
275 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'"> | 277 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'"> |
@@ -288,6 +290,7 @@ | |||
288 | <GenerateDebugInformation>true</GenerateDebugInformation> | 290 | <GenerateDebugInformation>true</GenerateDebugInformation> |
289 | <SubSystem>Console</SubSystem> | 291 | <SubSystem>Console</SubSystem> |
290 | <AdditionalDependencies>lua53.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | 292 | <AdditionalDependencies>lua53.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> |
293 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release</AdditionalLibraryDirectories> | ||
291 | </Link> | 294 | </Link> |
292 | </ItemDefinitionGroup> | 295 | </ItemDefinitionGroup> |
293 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'"> | 296 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'"> |
@@ -306,6 +309,7 @@ | |||
306 | <GenerateDebugInformation>true</GenerateDebugInformation> | 309 | <GenerateDebugInformation>true</GenerateDebugInformation> |
307 | <SubSystem>Console</SubSystem> | 310 | <SubSystem>Console</SubSystem> |
308 | <AdditionalDependencies>lua52.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | 311 | <AdditionalDependencies>lua52.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> |
312 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug</AdditionalLibraryDirectories> | ||
309 | </Link> | 313 | </Link> |
310 | </ItemDefinitionGroup> | 314 | </ItemDefinitionGroup> |
311 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Win32'"> | 315 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Win32'"> |
@@ -324,6 +328,7 @@ | |||
324 | <GenerateDebugInformation>true</GenerateDebugInformation> | 328 | <GenerateDebugInformation>true</GenerateDebugInformation> |
325 | <SubSystem>Console</SubSystem> | 329 | <SubSystem>Console</SubSystem> |
326 | <AdditionalDependencies>lua52.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | 330 | <AdditionalDependencies>lua52.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> |
331 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release</AdditionalLibraryDirectories> | ||
327 | </Link> | 332 | </Link> |
328 | </ItemDefinitionGroup> | 333 | </ItemDefinitionGroup> |
329 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'"> | 334 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'"> |
@@ -342,6 +347,7 @@ | |||
342 | <GenerateDebugInformation>true</GenerateDebugInformation> | 347 | <GenerateDebugInformation>true</GenerateDebugInformation> |
343 | <SubSystem>Console</SubSystem> | 348 | <SubSystem>Console</SubSystem> |
344 | <AdditionalDependencies>lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | 349 | <AdditionalDependencies>lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> |
350 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug</AdditionalLibraryDirectories> | ||
345 | </Link> | 351 | </Link> |
346 | </ItemDefinitionGroup> | 352 | </ItemDefinitionGroup> |
347 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Win32'"> | 353 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Win32'"> |
@@ -360,6 +366,7 @@ | |||
360 | <GenerateDebugInformation>true</GenerateDebugInformation> | 366 | <GenerateDebugInformation>true</GenerateDebugInformation> |
361 | <SubSystem>Console</SubSystem> | 367 | <SubSystem>Console</SubSystem> |
362 | <AdditionalDependencies>lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | 368 | <AdditionalDependencies>lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> |
369 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release</AdditionalLibraryDirectories> | ||
363 | </Link> | 370 | </Link> |
364 | </ItemDefinitionGroup> | 371 | </ItemDefinitionGroup> |
365 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT|Win32'"> | 372 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT|Win32'"> |
@@ -785,6 +792,7 @@ | |||
785 | <OptimizeReferences>true</OptimizeReferences> | 792 | <OptimizeReferences>true</OptimizeReferences> |
786 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | 793 | <EnableCOMDATFolding>true</EnableCOMDATFolding> |
787 | <AdditionalDependencies>lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | 794 | <AdditionalDependencies>lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> |
795 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release</AdditionalLibraryDirectories> | ||
788 | </Link> | 796 | </Link> |
789 | </ItemDefinitionGroup> | 797 | </ItemDefinitionGroup> |
790 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'"> | 798 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'"> |