Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
fd58b31c26 | |||
fa1b618896 |
@@ -142,6 +142,9 @@ class Target:
|
||||
self.path_build = os.path.join("build", self.config["compilator"])
|
||||
|
||||
def create_number_from_version_string(self, data):
|
||||
tmp_data = data.split("-")
|
||||
if len(tmp_data) > 1:
|
||||
data = tmp_data[0]
|
||||
list = data.split(".")
|
||||
if len(list) == 1:
|
||||
list.append("0")
|
||||
|
@@ -99,9 +99,10 @@ def link(file, binary, target, depancy, name, basic_path, static = False):
|
||||
lib_name = elem[len(lib_path)+len(target.prefix_lib)+1:-len(target.suffix_lib_dynamic)]
|
||||
cmd.append("-L" + lib_path)
|
||||
cmd.append("-l" + lib_name)
|
||||
if len(list_dynamic) > 0:
|
||||
cmd.append("-Wl,-R$ORIGIN/../lib/")
|
||||
pass
|
||||
if target.name != "MacOs" \
|
||||
and target.name != "Android":
|
||||
if len(list_dynamic) > 0:
|
||||
cmd.append("-Wl,-R$ORIGIN/../lib/")
|
||||
except:
|
||||
pass
|
||||
try:
|
||||
|
@@ -91,7 +91,7 @@ def link(file, binary, target, depancy, name, basic_path, static=False):
|
||||
lib_name = elem[len(lib_path)+len(target.prefix_lib)+1:-len(target.suffix_lib_dynamic)]
|
||||
cmd.append("-L" + lib_path)
|
||||
cmd.append("-l" + lib_name)
|
||||
if target != "MacOs" \
|
||||
if target.name != "MacOs" \
|
||||
and target.name != "Android":
|
||||
if len(list_dynamic) > 0:
|
||||
cmd.append("-Wl,-R$ORIGIN/../lib/")
|
||||
|
Reference in New Issue
Block a user