Commit db8b4b32 authored by Daniel Brown's avatar Daniel Brown

missed conflict

parent 164372ee
......@@ -369,35 +369,7 @@ case "$1" in
NATIVE="-march=native"
CPUARCH=""
target_arch=$platform
<<<<<<< HEAD
if [[ "$platform" == 'linux' ]]; then
TARGET=$TARGET_LINUX
elif [[ "$platform" == 'mac' ]]; then
TARGET=$TARGET_MAC
elif [[ "$platform" == 'cygwin32' ]]; then
TARGET=$TARGET_WIN32
CPUARCH=
target_arch=win32
elif [[ "$platform" == 'cygwin64' ]]; then
TARGET=$TARGET_WIN64
CPUARCH=
target_arch=win64
elif [[ "$platform" == 'win32' ]]; then
TARGET=$TARGET_WIN32
CPUARCH=
target_arch=win64
elif [[ "$platform" == 'win64' ]]; then
TARGET=$TARGET_WIN64
CPUARCH=
target_arch=win64
else
echo "Platform Target could not be determined" | tee -a $LOGFILE
failure
fi
=======
if [[ "$platform" == 'linux' ]]; then
TARGET=$TARGET_LINUX
elif [[ "$platform" == 'mac' ]]; then
......@@ -423,7 +395,6 @@ case "$1" in
failure
fi
>>>>>>> develop
echo "Building native Finesse version:" | tee -a $LOGFILE
;;
"--build-linux")
......@@ -476,17 +447,10 @@ case "$1" in
"--remove")
echo "--remove is no longer used." | tee -a $LOGFILE
;;
<<<<<<< HEAD
"--clean")
TARGET=$TARGET_CLEAN
;;
"--make-win-package")
=======
"--clean")
TARGET=$TARGET_CLEAN
;;
"--make-win-package")
>>>>>>> develop
make-win-package
exit 0
;;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment