From 223b5429f045eef886b42a880c3ddc6bd9889422 Mon Sep 17 00:00:00 2001 From: LiamDevine Date: Wed, 16 Jun 2010 19:20:41 +0100 Subject: [PATCH] checked lib section for a static lib --- src/actions/vstudio/vs2010_vcxproxj.lua | 2 +- tests/actions/vstudio/test_vs2010_project_kinds.lua | 11 +++++++++++ todo.txt | 8 ++------ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/actions/vstudio/vs2010_vcxproxj.lua b/src/actions/vstudio/vs2010_vcxproxj.lua index 66496986..c32ba654 100644 --- a/src/actions/vstudio/vs2010_vcxproxj.lua +++ b/src/actions/vstudio/vs2010_vcxproxj.lua @@ -295,7 +295,7 @@ premake.vstudio.vcxproj = { } function item_def_lib(cfg) if cfg.kind == 'StaticLib' then _p(1,'') - _p(2,'$(OutDir)%s.lib',"some_name") + _p(2,'$(OutDir)%s',cfg.buildtarget.name) _p(1,'') end end diff --git a/tests/actions/vstudio/test_vs2010_project_kinds.lua b/tests/actions/vstudio/test_vs2010_project_kinds.lua index 44f9be82..91eb932f 100644 --- a/tests/actions/vstudio/test_vs2010_project_kinds.lua +++ b/tests/actions/vstudio/test_vs2010_project_kinds.lua @@ -26,4 +26,15 @@ kind "StaticLib" local buffer = get_buffer() test.string_does_not_contain(buffer,'*.*') + end + + function vs10_project_kinds.staticLib_containsLibSection() + kind "StaticLib" + local buffer = get_buffer() + test.string_contains(buffer,'*.**.*') + end + function vs10_project_kinds.staticLib_libSection_containsProjectNameDotLib() + kind "StaticLib" + local buffer = get_buffer() + test.string_contains(buffer,'*.**.*MyProject.lib*.**.*') end \ No newline at end of file diff --git a/todo.txt b/todo.txt index 945ec43e..e5146499 100644 --- a/todo.txt +++ b/todo.txt @@ -16,16 +16,12 @@ fix ProgramDataBaseFileName tag currently at line 285 see note which states this can not be converted when using the upgrade tool added for now but it will removed or altered when I find out what is the correct thing to do. + +check why true is missing in a debug static lib build support C support Managed C++ support C# -find out why a unit test is failing -fails at the following test_os line 16 - function suite.findlib_FindSystemLib() - local libname = iif(os.is("windows"), "user32", "m") - test.istrue(os.findlib(libname)) - end No64BitChecks is removed after being deprciated in previous releases