From db3534da1bcbf286df7ac4c8736f5c5157399ced Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sun, 17 Jul 2016 08:18:45 +0200 Subject: Redesign obj to exe/lib mapping Specifically: * objso{} and libso{} target types have been renamed to objs{} and libs{} * obje{} has been added (so now we have obje{}, obja{}, and objs{}) * obje{} is now used for building exe{} * object file extensions have been changed to use "hierarchical extensions" that reflect the extension of the corresponding exe/lib target (instead of the -so suffix we used), specifically: obje{}: foo.o, (UNIX), foo.exe.o (MinGW), foo.exe.obj (Windows) obja{}: foo.a.o (UNIX, MinGW), foo.lib.obj (Windows) objs{}: foo.so.o (UNIX), foo.dylib.o (Darwin), foo.dll.o (MinGW), foo.dll.obj (Windows) --- build2/cxx/windows-rpath.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build2/cxx/windows-rpath.cxx') diff --git a/build2/cxx/windows-rpath.cxx b/build2/cxx/windows-rpath.cxx index 8f19f79..0bd4bc5 100644 --- a/build2/cxx/windows-rpath.cxx +++ b/build2/cxx/windows-rpath.cxx @@ -49,7 +49,7 @@ namespace build2 for (target* pt: t.prerequisite_targets) { - if (libso* ls = pt->is_a ()) + if (libs* ls = pt->is_a ()) { // This can be an installed library in which case we will have just // the import stub but may also have just the DLL. For now we don't @@ -84,7 +84,7 @@ namespace build2 { for (target* pt: t.prerequisite_targets) { - if (libso* ls = pt->is_a ()) + if (libs* ls = pt->is_a ()) { if (ls->member == nullptr) continue; -- cgit v1.1