robot0nfire/fl0w-old
robot0nfire/fl0w-old
Archived
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity Actions

Hopefully fixed linking

Browse source
This commit is contained in:
PhilipTrauner 2016-04-09 19:13:46 +02:00
parent 7e1a683f5c
commit e5d64f4738
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Server/Server.py
View file

@ -114,9 +114,9 @@ class Compile(Routing.ServerRoute):
def __init__(self, binary_path): def __init__(self, binary_path):
self.binary_path = os.path.abspath(binary_path) + "/" self.binary_path = os.path.abspath(binary_path) + "/"
self.botball_library_avaliable = os.path.isfile("/usr/local/lib/libbotball.so") self.wallaby_library_avaliable = os.path.isfile("/usr/local/lib/libaurora.so") and os.path.isfile("/usr/local/lib/libdaylite.so")
if not self.botball_library_avaliable: if not self.wallaby_library_avaliable:
Logging.warning("Botball libraries not found. All botball functions are unavaliable.") Logging.warning("Wallaby library not found. All Wallaby functions are unavaliable.")
if platform.machine() != "armv7l": if platform.machine() != "armv7l":
Logging.warning("Wrong processor architecture! Generated binaries will not run on Wallaby Controllers.") Logging.warning("Wrong processor architecture! Generated binaries will not run on Wallaby Controllers.")
@ -128,9 +128,8 @@ class Compile(Routing.ServerRoute):
if not os.path.exists(full_path): if not os.path.exists(full_path):
os.mkdir(full_path) os.mkdir(full_path)
error = True error = True
command = ["gcc", "-pipe", "-O0", "-lbotball", "-lwallaby", "-o", "%s" % full_path + "/botball_user_program", path + relpath] command = ["gcc", "-pipe", "-O0", "-lwallaby", "-o", "%s" % full_path + "/botball_user_program", path + relpath]
if not self.botball_library_avaliable: if not self.wallaby_library_avaliable:
del command[command.index("-lbotball")]
del command[command.index("-lwallaby")] del command[command.index("-lwallaby")]
p = Popen(command, stdout=PIPE, stderr=PIPE) p = Popen(command, stdout=PIPE, stderr=PIPE)
error = False if p.wait() == 0 else True error = False if p.wait() == 0 else True