Skip to content
Permalink
Browse files

Added WindowsTouch to External build script, changed build_solution t…

…o accept platform configuration.
  • Loading branch information...
valyard committed Jul 20, 2016
1 parent 770b005 commit fbaf5aba2bf868c6198957c3e0e1cc91888510ce
@@ -3,12 +3,12 @@
# Builds a solution on OSX and Windows.
# Assumes that Unity is located either in /Applications/Unity/ or c:\Program Files\Unity\.

if [[ $# -eq 0 ]] ; then
printf "\e[31mUsage: build_solution.sh <path to solution>\e[39m\n"
if [[ $# -ne 2 ]] ; then
printf "\e[31mUsage: build_solution.sh <path to solution> <x86|x64|Any CPU>\e[39m\n"
exit 0
fi

printf "\e[1;33mBuilding ${1}.\e[0;39m\n"
printf "\e[1;33mBuilding ${1} (${2}).\e[0;39m\n"

# Mac
if [ "$(uname)" == "Darwin" ]; then
@@ -21,5 +21,5 @@ if [ "$(uname)" == "Darwin" ]; then

# Windows
elif [ "$(expr substr $(uname -s) 1 10)" == "MINGW32_NT" ] || [ "$(expr substr $(uname -s) 1 10)" == "MINGW64_NT" ]; then
/c/Windows/Microsoft.NET/Framework/v4.0.30319/msbuild.exe ${1} -p:Configuration=Release -clp:ErrorsOnly
/c/Windows/Microsoft.NET/Framework/v4.0.30319/msbuild.exe "${1}" -p:Platform="${2}" -p:Configuration=Release -clp:ErrorsOnly -p:VCTargetsPath="C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V140"
fi
@@ -7,6 +7,6 @@ PROJECT=$(cd "$DIR/../TUIOsharp" && pwd)
LIBS=$(cd "$DIR/../../../Source/Assets/TouchScript/Modules/TUIO/Libraries/" && pwd)
SLN="$PROJECT/TUIOsharp.sln"

"$DIR/../../../Build/utils/build_solution.sh" $SLN
"$DIR/../../../Build/utils/build_solution.sh" $SLN "Any CPU"
cp "$PROJECT/TUIOsharp/bin/Release/TUIOsharp.dll" "$LIBS"
cp "$PROJECT/TUIOsharp/bin/Release/OSCsharp.dll" "$LIBS"
@@ -245,4 +245,6 @@ _Pvt_Extensions

# JetBrains Rider
.idea/
*.sln.iml
*.sln.iml

*.VC.db
@@ -0,0 +1,16 @@
#!/bin/bash

printf "\n\e[1;36mBuilding External/WindowsTouch.\e[0;39m\n"

UNAME=$(uname -s)
if [ "${UNAME:0:10}" != "MINGW32_NT" ] && [ "${UNAME:0:10}" != "MINGW64_NT" ]; then
printf "\e[31mNeed to build WindowsTouch.dll on Windows!\e[39m\n"
exit 0
fi

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
PROJECT=$(cd "$DIR/../" && pwd)
SLN="$PROJECT/WindowsTouch.sln"

"$DIR/../../../Build/utils/build_solution.sh" $SLN x86
"$DIR/../../../Build/utils/build_solution.sh" $SLN x64

0 comments on commit fbaf5ab

Please sign in to comment.
You can’t perform that action at this time.