mii/rust-openvr
1
0
Fork 0
mirror of https://github.com/mii443/rust-openvr.git synced 2025-08-23 00:35:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure libraries depend on "lib"

Browse Source
This commit is contained in:
Erick Tryzelaar
2014-06-26 08:00:06 -07:00
parent a47b138be3
commit 043b929b0e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configure_ovr.py
View File

@ -182,7 +182,7 @@ class LibXcodebuild(Module):
self.dep_modules = [] self.dep_modules = []
def make_rule(self, mods): def make_rule(self, mods):
out = "%s: %s\n" % (self.get_ename(), out = "%s: lib %s\n" % (self.get_ename(),
" ".join(mods[m].get_ename() for m in self.dep_modules)) " ".join(mods[m].get_ename() for m in self.dep_modules))
out += "\txcodebuild -project %s build\n\tcp %s lib\n" % ( out += "\txcodebuild -project %s build\n\tcp %s lib\n" % (
self.get_path_to_xcode_project(), self.get_path_to_output_dir() self.get_path_to_xcode_project(), self.get_path_to_output_dir()
@ -221,7 +221,7 @@ class LibMakefile(Module):
self.dep_modules = [] self.dep_modules = []
def make_rule(self, mods): def make_rule(self, mods):
out = "%s: %s %s\n" % (self.get_ename(), out = "%s: lib %s %s\n" % (self.get_ename(),
self.get_path_to_makefile_dir() + "Makefile", self.get_path_to_makefile_dir() + "Makefile",
" ".join(mods[m].get_ename() for m in self.dep_modules)) " ".join(mods[m].get_ename() for m in self.dep_modules))
out += "\tmake -j 16 -C %s\n\tcp %s lib\n" % ( out += "\tmake -j 16 -C %s\n\tcp %s lib\n" % (
@ -238,7 +238,7 @@ class LibConfigureMakefile(LibMakefile):
out += "\tcd %s && ./configure\n\n" % ( out += "\tcd %s && ./configure\n\n" % (
os.path.join(self.get_path_to_makefile_dir()) os.path.join(self.get_path_to_makefile_dir())
) )
out += "%s: %s\n" % (self.get_ename(), os.path.join(self.get_path_to_makefile_dir(), "Makefile")) out += "%s: lib %s\n" % (self.get_ename(), os.path.join(self.get_path_to_makefile_dir(), "Makefile"))
out += "\tmake -j 16 -C %s\n\tcp %s lib\n" % ( out += "\tmake -j 16 -C %s\n\tcp %s lib\n" % (
self.get_path_to_makefile_dir(), self.get_path_to_output_dir() self.get_path_to_makefile_dir(), self.get_path_to_output_dir()
) )
@ -276,7 +276,7 @@ class LibCMake(Module):
def make_rule(self, mods): def make_rule(self, mods):
out = "%s:\n" % (self.get_path_to_makefile_dir() + "Makefile") out = "%s:\n" % (self.get_path_to_makefile_dir() + "Makefile")
out += "\tcd %s && cmake %s .\n\n" % (self.get_path_to_makefile_dir(), self.cmake_flags) out += "\tcd %s && cmake %s .\n\n" % (self.get_path_to_makefile_dir(), self.cmake_flags)
out += "%s: %s %s\n" % (self.get_ename(), out += "%s: lib %s %s\n" % (self.get_ename(),
self.get_path_to_makefile_dir() + "Makefile", self.get_path_to_makefile_dir() + "Makefile",
" ".join(mods[m].get_ename() for m in self.dep_modules)) " ".join(mods[m].get_ename() for m in self.dep_modules))
out += "\tmake -j 16 -C %s && cp %s lib\n" % ( out += "\tmake -j 16 -C %s && cp %s lib\n" % (