Browse Source

Fixed build files to run mono64 in 64-bit non-VS builds.

pull/809/head
Joao Matos 8 years ago
parent
commit
9dc880dd6a
  1. 5
      build/Tests.lua
  2. 1
      build/scripts/LLVM.lua
  3. 2
      src/CppParser/Bindings/CSharp/premake5.lua
  4. 10
      tests/NamespacesBase/premake4.lua

5
build/Tests.lua

@ -20,7 +20,7 @@ end @@ -20,7 +20,7 @@ end
function SetupTestProject(name, extraFiles)
SetupTestGeneratorProject(name)
SetupTestNativeProject(name)
SetupTestNativeProject(name)
SetupTestProjectsCSharp(name, nil, extraFiles)
SetupTestProjectsCLI(name, extraFiles)
end
@ -73,7 +73,8 @@ function SetupTestGeneratorProject(name, depends) @@ -73,7 +73,8 @@ function SetupTestGeneratorProject(name, depends)
end
function SetupTestGeneratorBuildEvent(name)
local runtimeExe = os.is("windows") and "" or "mono --debug "
local monoExe = _OPTIONS["arch"] == "x64" and "mono64" or "mono"
local runtimeExe = os.is("windows") and "" or monoExe .. " --debug "
if string.starts(action, "vs") then
local exePath = SafePath("$(TargetDir)" .. name .. ".Gen.exe")
prebuildcommands { runtimeExe .. exePath }

1
build/scripts/LLVM.lua

@ -66,7 +66,6 @@ function get_toolset_configuration_name(arch) @@ -66,7 +66,6 @@ function get_toolset_configuration_name(arch)
if not arch then
arch = _OPTIONS["arch"]
end
print(arch)
if os.is("windows") then
local vsver = _ACTION

2
src/CppParser/Bindings/CSharp/premake5.lua

@ -18,7 +18,7 @@ project "CppSharp.Parser.CSharp" @@ -18,7 +18,7 @@ project "CppSharp.Parser.CSharp"
elseif os.is("macosx") then
local file = io.popen("lipo -info `which mono`")
local output = file:read('*all')
if string.find(output, "x86_64") then
if string.find(output, "x86_64") or _OPTIONS["arch"] == "x64" then
files { "x86_64-apple-darwin12.4.0/**.cs" }
else
files { "i686-apple-darwin12.4.0/**.cs" }

10
tests/NamespacesBase/premake4.lua

@ -3,14 +3,8 @@ function SetupWrapper(name) @@ -3,14 +3,8 @@ function SetupWrapper(name)
SetupManagedTestProject()
dependson { name .. ".Native", "NamespacesDerived.Gen" }
local runtimeExe = os.is("windows") and "" or "mono --debug "
if string.starts(action, "vs") then
local exePath = SafePath("$(TargetDir)NamespacesDerived.Gen.exe")
prebuildcommands { runtimeExe .. exePath }
else
local exePath = SafePath("%{cfg.buildtarget.directory}/NamespacesDerived.Gen.exe")
prebuildcommands { runtimeExe .. exePath }
end
SetupTestGeneratorBuildEvent("NamespacesDerived")
files
{

Loading…
Cancel
Save