@@ -14,7 +14,6 @@ AddonBuilder := Object clone do( linkDirPathFlag := "-libpath:" linkLibFlag := "" linkOutFlag := "-out:" - linkLibPrefix := "" linkLibSuffix := ".lib" ar := "link -lib -nologo" arFlags := "-out:" @@ -26,7 +25,6 @@ AddonBuilder := Object clone do( linkdll := cc linkDirPathFlag := "-L" linkLibFlag := "-l" - linkLibPrefix := "lib" linkLibSuffix := "" linkOutFlag := "-o " linkLibSuffix := "" @@ -301,7 +299,7 @@ AddonBuilder := Object clone do( links := depends addons map(b, linkDirPathFlag .. "../" .. b .. "/_build/dll") - links appendSeq(depends addons map(v, linkLibFlag .. linkLibPrefix .. "Io" .. v .. linkLibSuffix)) + links appendSeq(depends addons map(v, linkLibFlag .. "Io" .. v .. linkLibSuffix)) if(platform == "windows", links appendSeq(depends syslibs map(v, v .. ".lib")) ) @@ -309,8 +307,8 @@ AddonBuilder := Object clone do( links appendSeq(depends addons map(v, "-Wl,--rpath -Wl," .. System installPrefix .. "/lib/io/addons/" .. v .. "/_build/dll/")) ) links appendSeq(libSearchPaths map(v, linkDirPathFlag .. v)) - links appendSeq(depends libs map(v, linkLibFlag .. linkLibPrefix .. v .. linkLibSuffix)) - links appendSeq(list(linkDirPathFlag .. "../../_build/dll", linkLibFlag .. linkLibPrefix .. "iovmall" .. linkLibSuffix)) + links appendSeq(depends libs map(v, linkLibFlag .. v .. linkLibSuffix)) + links appendSeq(list(linkDirPathFlag .. "../../_build/dll", linkLibFlag .. "iovmall" .. linkLibSuffix)) links appendSeq(depends frameworks map(v, "-framework " .. v)) links appendSeq(depends linkOptions) build/AddonBuilder.io a34680297e93c4ddd175c3017f03788aeca7cd40 Paul Gregory pgregory@aqsis.org http://github.com/stevedekorte/io/commit/ffab21d678af9f7e4534ae55afa68990325b030f ffab21d678af9f7e4534ae55afa68990325b030f 2009-05-09T14:39:37-07:00 2009-05-09T14:39:37-07:00 Fix error in the addon builder introduces by the Win32 changes. It was adding a library prefix to the link line, which is unnecessary. d0b0afd1fc331b3abb139e03cc631c4211f93439 Paul Gregory pgregory@aqsis.org