atria-tools/lutin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] work on managing sdl

Browse Source
This commit is contained in:
Edouard DUPIN 2013-11-11 20:15:52 +01:00
parent 1a424abd21
commit 47c1762724
2 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lutinTarget.py
View File

@ -13,7 +13,7 @@ class Target:
debug.info("================================="); debug.info("=================================");
debug.info("== Target='"+self.name +"'"); debug.info("== Target='"+self.name +"'");
debug.info("================================="); debug.info("=================================");
if "clang"==typeCompilator: if typeCompilator == "clang":
self.cc=self.cross + "clang" self.cc=self.cross + "clang"
self.xx=self.cross + "clang++" self.xx=self.cross + "clang++"
else: else:
@ -30,7 +30,7 @@ class Target:
############################################################################### ###############################################################################
self.global_include_cc=[] self.global_include_cc=[]
self.global_flags_cc=['-D__TARGET_OS__'+self.name] self.global_flags_cc=['-D__TARGET_OS__'+self.name]
self.global_flags_xx=[] self.global_flags_xx=['-std=c++11']
self.global_flags_mm=[] self.global_flags_mm=[]
self.global_flags_m=[] self.global_flags_m=[]
self.global_flags_ar=['rcs'] self.global_flags_ar=['rcs']

28
lutinTargetAndroid.py
View File

@ -35,6 +35,9 @@ class Target(lutinTarget.Target):
gccVersion = "4.8" gccVersion = "4.8"
if lutinHost.OS64BITS==True: if lutinHost.OS64BITS==True:
tmpOsVal = "_64" tmpOsVal = "_64"
if typeCompilator == "clang":
cross = self.folder_ndk + "/toolchains/llvm-3.3/prebuilt/linux-x86_64/bin/"
else:
baseFolderArm = self.folder_ndk + "/toolchains/arm-linux-androideabi-" + gccVersion + "/prebuilt/linux-x86" + tmpOsVal + "/bin/" baseFolderArm = self.folder_ndk + "/toolchains/arm-linux-androideabi-" + gccVersion + "/prebuilt/linux-x86" + tmpOsVal + "/bin/"
baseFolderMips = self.folder_ndk + "/toolchains/mipsel-linux-android-" + gccVersion + "/prebuilt/linux-x86" + tmpOsVal + "/bin/" baseFolderMips = self.folder_ndk + "/toolchains/mipsel-linux-android-" + gccVersion + "/prebuilt/linux-x86" + tmpOsVal + "/bin/"
baseFolderX86 = self.folder_ndk + "/toolchains/x86-" + gccVersion + "/prebuilt/linux-x86" + tmpOsVal + "/bin/" baseFolderX86 = self.folder_ndk + "/toolchains/x86-" + gccVersion + "/prebuilt/linux-x86" + tmpOsVal + "/bin/"
@ -46,10 +49,11 @@ class Target(lutinTarget.Target):
if not os.path.isdir(baseFolderX86): if not os.path.isdir(baseFolderX86):
debug.info("Gcc x86 pah does not exist !!!") debug.info("Gcc x86 pah does not exist !!!")
if typeCompilator!="gcc": lutinTarget.Target.__init__(self, "Android", typeCompilator, debugMode, generatePackage, arch, cross)
debug.error("Android does not support '" + typeCompilator + "' compilator ... availlable : [gcc]")
lutinTarget.Target.__init__(self, "Android", "gcc", debugMode, generatePackage, arch, cross) # for gcc :
# for clang :
self.folder_bin="/mustNotCreateBinary" self.folder_bin="/mustNotCreateBinary"
@ -60,8 +64,22 @@ class Target(lutinTarget.Target):
# board id at 14 is for android 4.0 and more ... # board id at 14 is for android 4.0 and more ...
self.boardId = 14 self.boardId = 14
self.global_include_cc.append("-I" + self.folder_ndk +"/platforms/android-" + str(self.boardId) + "/arch-arm/usr/include") self.global_include_cc.append("-I" + self.folder_ndk +"/platforms/android-" + str(self.boardId) + "/arch-arm/usr/include/")
#self.global_include_cc.append("-I" + self.folder_ndk +"/platforms/android-" + str(self.boardId) + "/arch-mips/usr/include/")
#self.global_include_cc.append("-I" + self.folder_ndk +"/platforms/android-" + str(self.boardId) + "/arch-x86/usr/include/")
self.global_include_cc.append("-I" + self.folder_ndk +"/sources/cxx-stl/system/include/") self.global_include_cc.append("-I" + self.folder_ndk +"/sources/cxx-stl/system/include/")
if True:
if typeCompilator == "clang":
self.global_include_cc.append("-I" + self.folder_ndk +"/sources/cxx-stl/llvm-libc++/libcxx/include/")
else:
self.global_include_cc.append("-I" + self.folder_ndk +"/sources/cxx-stl/gnu-libstdc++/" + gccVersion + "/include/")
#self.global_include_cc.append("-I" + self.folder_ndk +"/sources/cxx-stl/gnu-libstdc++/" + gccVersion + "/libs/x86/include/")
self.global_include_cc.append("-I" + self.folder_ndk +"/sources/cxx-stl/gnu-libstdc++/" + gccVersion + "/libs/armeabi/include/")
#self.global_include_cc.append("-I" + self.folder_ndk +"/sources/cxx-stl/gnu-libstdc++/" + gccVersion + "/libs/armeabi-v7a/include/")
#self.global_include_cc.append("-I" + self.folder_ndk +"/sources/cxx-stl/gnu-libstdc++/" + gccVersion + "/libs/mips/include/")
else :
self.global_include_cc.append("-I" + self.folder_ndk +"/sources/cxx-stl/stlport/stlport/")
self.global_flags_ld.append(self.folder_ndk +"/platforms/android-" + str(self.boardId) + "/arch-arm/usr/lib/libstdc++.a")
self.global_sysroot = "--sysroot=" + self.folder_ndk +"/platforms/android-" + str(self.boardId) + "/arch-arm" self.global_sysroot = "--sysroot=" + self.folder_ndk +"/platforms/android-" + str(self.boardId) + "/arch-arm"
@ -101,7 +119,7 @@ class Target(lutinTarget.Target):
self.global_flags_cc.append("-fomit-frame-pointer") self.global_flags_cc.append("-fomit-frame-pointer")
self.global_flags_cc.append("-fno-strict-aliasing") self.global_flags_cc.append("-fno-strict-aliasing")
self.global_flags_xx.append("-fno-rtti") self.global_flags_xx.append("-frtti")
self.global_flags_xx.append("-Wa,--noexecstack") self.global_flags_xx.append("-Wa,--noexecstack")