зеркало из https://github.com/mono/CppSharp.git
Simplify build output directory to not contain the architecture. (#1869)
This commit is contained in:
Родитель
3ca746a654
Коммит
166e45e9af
|
@ -23,7 +23,7 @@
|
|||
<GlobalTargetFramework>$(TargetFramework)</GlobalTargetFramework>
|
||||
<BaseIntermediateOutputPath>$(ObjDir)$(MSBuildProjectName)\</BaseIntermediateOutputPath>
|
||||
<BaseOutputPath>$(RootDir)bin\</BaseOutputPath>
|
||||
<OutputPath>$(BaseOutputPath)$(Configuration)_$(PlatformTarget)\</OutputPath>
|
||||
<OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
|
||||
<ActionDir>$(BuildDir)$(PremakeAction)\</ActionDir>
|
||||
<NativeProjectsDir>$(ActionDir)projects\</NativeProjectsDir>
|
||||
<PackageDir>$(RootDir)artifacts\package\</PackageDir>
|
||||
|
|
|
@ -59,7 +59,7 @@ bindir = path.join(rootdir, "bin")
|
|||
objsdir = path.join(builddir, "obj");
|
||||
gendir = path.join(builddir, "gen");
|
||||
actionbuilddir = path.join(builddir, _ACTION == "gmake2" and "gmake" or (_ACTION and _ACTION or ""));
|
||||
bindircfg = path.join(bindir, "%{cfg.buildcfg}_%{cfg.platform}");
|
||||
bindircfg = path.join(bindir, "%{cfg.buildcfg}");
|
||||
prjobjdir = path.join(objsdir, "%{prj.name}", "%{cfg.buildcfg}")
|
||||
|
||||
msvc_buildflags = { "/MP", "/wd4267" }
|
||||
|
|
|
@ -99,7 +99,7 @@ pack()
|
|||
|
||||
test()
|
||||
{
|
||||
dotnet test {"$bindir/${configuration}_$platform","$gendir"/*}/*.Tests*.dll --nologo
|
||||
dotnet test {"$bindir/${configuration}","$gendir"/*}/*.Tests*.dll --nologo
|
||||
}
|
||||
|
||||
clean()
|
||||
|
|
|
@ -30,7 +30,7 @@ generate=true
|
|||
|
||||
if [ $generate = true ]; then
|
||||
echo "${green}Generating bindings${reset}"
|
||||
dotnet $rootdir/bin/${dotnet_configuration}_${platform}/CppSharp.CLI.dll \
|
||||
dotnet $rootdir/bin/${dotnet_configuration}/CppSharp.CLI.dll \
|
||||
--gen=emscripten --platform=emscripten --arch=wasm32 \
|
||||
-I$dir/.. -I$rootdir/include -o $dir/gen -m tests $dir/../*.h
|
||||
fi
|
||||
|
|
|
@ -16,7 +16,7 @@ else
|
|||
fi
|
||||
|
||||
echo "${green}Generating bindings${reset}"
|
||||
dotnet $rootdir/bin/${configuration}_${platform}/CppSharp.CLI.dll \
|
||||
dotnet $rootdir/bin/${configuration}/CppSharp.CLI.dll \
|
||||
--gen=napi -I$dir/.. -o $dir/gen -m tests $dir/../*.h
|
||||
|
||||
echo "${green}Building generated binding files${reset}"
|
||||
|
|
|
@ -4,7 +4,6 @@ dir=$(cd "$(dirname "$0")"; pwd)
|
|||
rootdir="$dir/../.."
|
||||
dotnet_configuration=Release
|
||||
configuration=debug
|
||||
platform=x64
|
||||
jsinterp="$dir/runtime/build/qjs"
|
||||
|
||||
cd $dir
|
||||
|
@ -23,7 +22,7 @@ generate=true
|
|||
|
||||
if [ $generate = true ]; then
|
||||
echo "${green}Generating bindings${reset}"
|
||||
dotnet $rootdir/bin/${dotnet_configuration}_${platform}/CppSharp.CLI.dll \
|
||||
dotnet $rootdir/bin/${dotnet_configuration}/CppSharp.CLI.dll \
|
||||
$dir/bindings.lua
|
||||
fi
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@ generate=true
|
|||
|
||||
if [ $generate = true ]; then
|
||||
echo "${green}Generating bindings${reset}"
|
||||
dotnet $rootdir/bin/${dotnet_configuration}_${platform}/CppSharp.CLI.dll \
|
||||
dotnet $rootdir/bin/${dotnet_configuration}/CppSharp.CLI.dll \
|
||||
--gen=ts -I$dir/.. -I$rootdir/include -o $dir/gen -m tests $dir/../*.h
|
||||
fi
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче