Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
finesse
finesse
Commits
db8b4b32
Commit
db8b4b32
authored
Dec 12, 2019
by
Daniel Brown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
missed conflict
parent
164372ee
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
37 deletions
+1
-37
finesse.sh
finesse.sh
+1
-37
No files found.
finesse.sh
View file @
db8b4b32
...
...
@@ -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
;;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment