AuroraPipeline/premake
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

Bug 2790865: SharedLib on OSX (actually a patch by Ash Berlin)

Browse Source
This commit is contained in:
starkos 2009-05-29 19:00:14 +00:00
parent 724498ad9d
commit d20ce6c62c
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -18,6 +18,7 @@
- Bug 2564404: FatalWarnings has no effect with gmake target
- Bug 2550759: pchheader option has wrong type
- Bug 1900333: Parentheses in build path
- Bug 2790865: SharedLib on OSX fixes (Ash Berlin)
-----

2
src/base/project.lua
View File

@ -398,7 +398,7 @@
dir = path.join(dir, name .. ".app/Contents/MacOS")
elseif kind == "SharedLib" then
prefix = "lib"
suffix = ".so"
suffix = iif(system == "macosx", ".dylib", ".so")
elseif kind == "StaticLib" then
prefix = "lib"
suffix = ".a"

10
src/host/scripts.c
View File

File diff suppressed because one or more lines are too long

4
tests/test_targets.lua
View File

@ -314,7 +314,7 @@
function T.targets.SharedLib_Linux_Build_MacOSX()
cfg.kind = "SharedLib"
result = premake.gettarget(cfg, "build", "linux", "macosx")
test.isequal([[../bin/libMyProject.so]], result.fullpath)
test.isequal([[../bin/libMyProject.dylib]], result.fullpath)
end
function T.targets.SharedLib_Linux_Link_Windows()
@ -332,7 +332,7 @@
function T.targets.SharedLib_Linux_Link_MacOSX()
cfg.kind = "SharedLib"
result = premake.gettarget(cfg, "link", "linux", "macosx")
test.isequal([[../bin/libMyProject.so]], result.fullpath)
test.isequal([[../bin/libMyProject.dylib]], result.fullpath)
end