From 3a4173c67b2e2339f048fe75b5224df43ac485d2 Mon Sep 17 00:00:00 2001 From: Benoit Germain Date: Thu, 20 Mar 2025 14:06:21 +0100 Subject: A few vcproj tweaks --- Lanes.vcxproj | 85 +++++++++----------- .../deep_userdata_example.vcxproj | 92 +++++++++++++--------- unit_tests/UnitTests.vcxproj | 48 ++++++----- 3 files changed, 120 insertions(+), 105 deletions(-) diff --git a/Lanes.vcxproj b/Lanes.vcxproj index b709f92..98e1d37 100644 --- a/Lanes.vcxproj +++ b/Lanes.vcxproj @@ -576,7 +576,6 @@ MachineX86 - $(IntDir)$(TargetName).pdb $(IntDir)$(TargetName).pgd $(IntDir)$(TargetName).lib @@ -620,7 +619,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua51\ $(IntDir)$(TargetName).lib - xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\ + xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\ Copy to LuaJIT @@ -652,7 +651,6 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua51\ MachineX86 - $(IntDir)$(TargetName).pdb $(IntDir)$(TargetName).pgd $(IntDir)$(TargetName).lib @@ -735,7 +733,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua54\ $(IntDir)$(TargetName).lib - xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\MoonJIT\bin\$(Platform)\ + xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\MoonJIT\bin\$(Platform)\ Copy to MoonJIT @@ -773,7 +771,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua54\ xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\ -xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua513\bin\$(Platform)\Release\ +xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\ Copy to Lua 5.3 @@ -878,7 +876,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua51\ - xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\ + xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\ Copy to LuaJIT @@ -978,7 +976,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua54\ - xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\MoonJIT\bin\$(Platform)\ + xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\MoonJIT\bin\$(Platform)\ Copy to MoonJIT @@ -1012,7 +1010,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua54\ xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\ -xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua513\bin\$(Platform)\Release\ +xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\ Copy to Lua 5.3 @@ -1079,7 +1077,6 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua54\ MachineX86 - $(IntDir)$(TargetName).pdb $(IntDir)$(TargetName).pgd $(IntDir)$(TargetName).lib @@ -1152,7 +1149,6 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua52\ MachineX86 - $(IntDir)$(TargetName).pdb $(IntDir)$(TargetName).pgd $(IntDir)$(TargetName).lib UseLinkTimeCodeGeneration @@ -1440,11 +1436,10 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua52\ Copy lanes.lua to Lua 5.1 Copy lanes.lua to LuaJIT Copy lanes.lua to Lua 5.3 - Copy lanes.lua to framework + Copy lanes.lua to Lua 5.4 Copy lanes.lua to MoonJIT - - - Copy lanes.lua to framework + Copy lanes.lua to Lua 5.3 + Copy lanes.lua to Lua 5.4 Copy lanes.lua to Lua 5.1 Copy lanes.lua to LuaJIT Copy lanes.lua to Lua 5.3 @@ -1454,31 +1449,29 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua52\ Copy lanes.lua to Lua 5.4 Copy lanes.lua to Lua 5.2 Copy lanes.lua to Lua 5.2 - xcopy /R /F /Y %(FullPath) $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\ - xcopy /R /F /Y %(FullPath) $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\lua - xcopy /R /F /Y %(FullPath) $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\ - xcopy /R /F /Y %(FullPath) $(SolutionDir)..\framework\ - xcopy /R /F /Y %(FullPath) $(SolutionDir)..\MoonJIT\bin\$(Platform)\lua - - - xcopy /R /F /Y %(FullPath) $(SolutionDir)..\framework\ - xcopy /R /F /Y %(FullPath) $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\ - xcopy /R /F /Y %(FullPath) $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\lua - xcopy /R /F /Y %(FullPath) $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\ - xcopy /R /F /Y %(FullPath) $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\ - xcopy /R /F /Y %(FullPath) $(SolutionDir)..\MoonJIT\bin\$(Platform)\lua - xcopy /R /F /Y %(FullPath) $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\ - xcopy /R /F /Y %(FullPath) $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\ - xcopy /R /F /Y %(FullPath) $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\ - xcopy /R /F /Y %(FullPath) $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\ + xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\ + xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\lua + xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\ + xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\ + xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\MoonJIT\bin\$(Platform)\lua + xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\ + xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\ + xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\ + xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\lua + xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\ + xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\ + xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\MoonJIT\bin\$(Platform)\lua + xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\ + xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\ + xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua2\bin\$(Platform)\Debug\ + xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua2\bin\$(Platform)\Debug\ $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\%(Filename)%(Extension) $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\lua\%(Filename)%(Extension) $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\%(Filename)%(Extension) - $(SolutionDir)..\framework\%(Filename)%(Extension) + $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\%(Filename)%(Extension) $(SolutionDir)..\MoonJIT\bin\$(Platform)\lua\%(Filename)%(Extension) - - - $(SolutionDir)..\framework\%(Filename)%(Extension) + $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\%(Filename)%(Extension) + $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\%(Filename)%(Extension) $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\%(Filename)%(Extension) $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\lua\%(Filename)%(Extension) $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\%(Filename)%(Extension) @@ -1488,23 +1481,17 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua52\ $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\%(Filename)%(Extension) $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\%(Filename)%(Extension) $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\%(Filename)%(Extension) - - + Copy lanes.lua to Lua 5.1 Copy lanes.lua to Lua 5.1 - - + Copy lanes.lua to Lua 5.2 Copy lanes.lua to Lua 5.2 - - - xcopy /R /F /Y %(FullPath) $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\ - - - xcopy /R /F /Y %(FullPath) $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\ - - + xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\ + xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\ + xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\ + xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\ + $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\%(Filename)%(Extension) $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\%(Filename)%(Extension) - - + $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\%(Filename)%(Extension) $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\%(Filename)%(Extension) 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 @@ MultiByte - Application + DynamicLibrary false v143 true MultiByte - Application + DynamicLibrary false v143 true @@ -437,6 +437,14 @@ $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ + $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + + + $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ + Level3 @@ -455,7 +463,7 @@ $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release - xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\ + xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\ Copy to Lua 5.3 @@ -477,7 +485,7 @@ $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release - xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\ + xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\ Copy to Lua 5.4 @@ -493,8 +501,8 @@ ProgramDatabase - xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\ - Lua 5.3 + xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\ + Copy to Lua 5.3 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) @@ -513,12 +521,12 @@ ProgramDatabase - xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\ - Copy to Lua 5.2 + xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\ + Copy to Lua 5.1 - 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) - $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug + 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) + $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug @@ -533,12 +541,12 @@ ProgramDatabase - xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\ - Copy to Lua 5.2 + xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\ + Copy to Lua 5.1 - 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) - $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug + 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) + $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release @@ -553,12 +561,12 @@ ProgramDatabase - xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\ + xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\ Copy to Lua 5.2 - 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) - $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug + 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) + $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug @@ -573,12 +581,12 @@ ProgramDatabase - xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\ + xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\ Copy to Lua 5.2 - 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) - $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug + 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) + $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release @@ -594,8 +602,8 @@ ProgramDatabase - xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\LuaJIT-2.0.5\bin\$(Platform)\ - Copy to LuaJITGIT + xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\ + Copy to LuaJIT 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) @@ -614,8 +622,8 @@ ProgramDatabase - xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\framework\ - Copy to framework + xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\ + Copy to Lua 5.4 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) @@ -634,7 +642,7 @@ ProgramDatabase - xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\MoonJIT\bin\$(Platform)\ + xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\MoonJIT\bin\$(Platform)\ Copy to MoonJIT @@ -654,7 +662,7 @@ ProgramDatabase - xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\ + xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\ Copy to Lua 5.3 @@ -674,7 +682,7 @@ ProgramDatabase - xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\ + xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\ Copy to Lua 5.1 @@ -694,12 +702,12 @@ ProgramDatabase - xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\ + xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\ Copy to Lua 5.1 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) - $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug + $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release @@ -714,7 +722,7 @@ ProgramDatabase - xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\ + xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\ Copy to Lua 5.2 @@ -734,12 +742,12 @@ ProgramDatabase - xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\ + xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\ Copy to Lua 5.2 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) - $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug + $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release @@ -754,8 +762,8 @@ ProgramDatabase - xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\LuaJIT-GIT\bin\$(Platform)\ - Copy to LuaJITGIT + xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\ + Copy to LuaJIT 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) @@ -774,7 +782,7 @@ ProgramDatabase - xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\ + xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\ Copy to Lua 5.4 @@ -794,7 +802,7 @@ ProgramDatabase - xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\MoonJIT\bin\$(Platform)\ + xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\MoonJIT\bin\$(Platform)\ Copy to MoonJIT @@ -820,6 +828,12 @@ 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) $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release + + xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\ + + + Copy to Lua 5.3 + @@ -839,6 +853,12 @@ 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) $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release + + xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\ + + + Copy to Lua 5.4 + 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 @@ - $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\ + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ - $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\ + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ - $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\ + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ - $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\ + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ - $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\ + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ - $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\ + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ - $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\ + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ - $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\ + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ - $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\ + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ - $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\ + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ - $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\ + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ - $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\ + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ - $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\ + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ - $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\ + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ - $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\ + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ - $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\ + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ - $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\ + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ - $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\ + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ - $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\ + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ - $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\ + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ @@ -252,6 +252,7 @@ true Console lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug @@ -270,6 +271,7 @@ true Console lua53.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug @@ -288,6 +290,7 @@ true Console lua53.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release @@ -306,6 +309,7 @@ true Console lua52.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug @@ -324,6 +328,7 @@ true Console lua52.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release @@ -342,6 +347,7 @@ true Console lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug @@ -360,6 +366,7 @@ true Console lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release @@ -785,6 +792,7 @@ true true lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release -- cgit v1.2.3-55-g6feb