Skip to content

Fixed visibility flag output for VS Android projects #2542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed visibility flag output for VS Android projects #2542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions modules/vstudio/tests/_tests.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ return {
"vc2022/test_toolset_settings.lua",

-- Android projects
"android/test_android_build_settings.lua",
"android/test_android_files.lua",
"android/test_android_project.lua",

Expand Down
36 changes: 36 additions & 0 deletions modules/vstudio/tests/android/test_android_build_settings.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
local p = premake
local suite = test.declare("vstudio_vs2010_android_compile_settings")
local vc2010 = p.vstudio.vc2010
local project = p.project

--
-- Setup
--

local wks, prj

function suite.setup()
p.action.set("vs2015")
system "android"
wks, prj = test.createWorkspace()
end

local function prepare(platform)
local cfg = test.getconfig(prj, "Debug", platform)
vc2010.clCompile(cfg)
end

--
-- Visibility settings should go into AdditionalOptions
--

function suite.additionalOptions_onVisibility()
visibility "Default"
prepare()
test.capture [[
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<Optimization>Disabled</Optimization>
<AdditionalOptions>-fvisibility=default %(AdditionalOptions)</AdditionalOptions>
]]
end
2 changes: 1 addition & 1 deletion modules/vstudio/vs2010_vcxproj.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4474,7 +4474,7 @@

-- -fvisibility=<>
if cfg.visibility ~= nil then
table.insert(opts, p.tools.gcc.cxxflags.visibility[cfg.visibility])
table.insert(opts, p.tools.gcc.shared.visibility[cfg.visibility])
end

if #opts > 0 then
Expand Down
Loading