shared obj extension now matches the makefile extension

This commit is contained in:
Andre Leiradella 2015-08-03 21:33:59 -03:00
parent 0f213f502a
commit cae12617c9
14 changed files with 39 additions and 39 deletions

View File

@ -43,8 +43,8 @@ AR = $(NDK_ROOT_DIR)/toolchains/aarch64-linux-android-4.9/prebuilt/$(HOST_PLATF
############
# Extensions
OBJEXT = .android_arm64_v8a.o
SOEXT = .android_arm64_v8a.so
OBJEXT = .android-arm64_v8a.o
SOEXT = .android-arm64_v8a.so
################
# Platform setup

View File

@ -43,8 +43,8 @@ AR = $(NDK_ROOT_DIR)/toolchains/arm-linux-androideabi-4.8/prebuilt/$(HOST_PLATF
############
# Extensions
OBJEXT = .armeabi.o
SOEXT = .armeabi.so
OBJEXT = .android-armeabi.o
SOEXT = .android-armeabi.so
################
# Platform setup

View File

@ -43,8 +43,8 @@ AR = $(NDK_ROOT_DIR)/toolchains/arm-linux-androideabi-4.8/prebuilt/$(HOST_PLATF
############
# Extensions
OBJEXT = .armeabi-v7a.o
SOEXT = .armeabi-v7a.so
OBJEXT = .android-armeabi_v7a.o
SOEXT = .android-armeabi_v7a.so
################
# Platform setup

View File

@ -43,8 +43,8 @@ AR = $(NDK_ROOT_DIR)/toolchains/mipsel-linux-android-4.8/prebuilt/$(HOST_PLATFO
############
# Extensions
OBJEXT = .android_mips.o
SOEXT = .android_mips.so
OBJEXT = .android-mips.o
SOEXT = .android-mips.so
################
# Platform setup

View File

@ -43,8 +43,8 @@ AR = $(NDK_ROOT_DIR)/toolchains/mips64el-linux-android-4.9/prebuilt/$(HOST_PLAT
############
# Extensions
OBJEXT = .android_mips64.o
SOEXT = .android_mips64.so
OBJEXT = .android-mips64.o
SOEXT = .android-mips64.so
################
# Platform setup

View File

@ -43,8 +43,8 @@ AR = $(NDK_ROOT_DIR)/toolchains/x86-4.8/prebuilt/$(HOST_PLATFORM)-x86_64/bin/i6
############
# Extensions
OBJEXT = .x86.o
SOEXT = .x86.so
OBJEXT = .android-x86.o
SOEXT = .android-x86.so
################
# Platform setup

View File

@ -43,8 +43,8 @@ AR = $(NDK_ROOT_DIR)/toolchains/x86_64-4.9/prebuilt/$(HOST_PLATFORM)-x86_64/bin
############
# Extensions
OBJEXT = .android_x86_64.o
SOEXT = .android_x86_64.so
OBJEXT = .android-x86_64.o
SOEXT = .android-x86_64.so
################
# Platform setup

View File

@ -43,8 +43,8 @@ AR = ar
############
# Extensions
OBJEXT = .linux_x86.o
SOEXT = .linux_x86.so
OBJEXT = .linux-x86.o
SOEXT = .linux-x86.so
################
# Platform setup

View File

@ -43,8 +43,8 @@ AR = ar
############
# Extensions
OBJEXT = .linux_x86_64.o
SOEXT = .linux_x86_64.so
OBJEXT = .linux-x86_64.o
SOEXT = .linux-x86_64.so
################
# Platform setup

View File

@ -43,8 +43,8 @@ AR = ar
############
# Extensions
OBJEXT = .linux_x86.o
SOEXT = .linux_x86.so
OBJEXT = .linux_portable-x86.o
SOEXT = .linux_portable-x86.so
################
# Platform setup

View File

@ -43,8 +43,8 @@ AR = ar
############
# Extensions
OBJEXT = .linux_x86_64.o
SOEXT = .linux_x86_64.so
OBJEXT = .linux_portable-x86_64.o
SOEXT = .linux_portable-x86_64.so
################
# Platform setup

View File

@ -43,8 +43,8 @@ AR = i686-w64-mingw32-ar
############
# Extensions
OBJEXT = .windows_x86.o
SOEXT = .windows_x86.dll
OBJEXT = .windows-x86.o
SOEXT = .windows-x86.dll
################
# Platform setup

View File

@ -43,8 +43,8 @@ AR = x86_64-w64-mingw32-ar
############
# Extensions
OBJEXT = .windows_x86_64.o
SOEXT = .windows_x86_64.dll
OBJEXT = .windows-x86_64.o
SOEXT = .windows-x86_64.dll
################
# Platform setup

View File

@ -115,7 +115,7 @@ local platforms = {
CXX = '$(NDK_ROOT_DIR)/toolchains/aarch64-linux-android-4.9/prebuilt/' .. host .. '/bin/aarch64-linux-android-g++',
AS = '$(NDK_ROOT_DIR)/toolchains/aarch64-linux-android-4.9/prebuilt/' .. host .. '/bin/aarch64-linux-android-as',
AR = '$(NDK_ROOT_DIR)/toolchains/aarch64-linux-android-4.9/prebuilt/' .. host .. '/bin/aarch64-linux-android-ar',
EXT = 'android_arm64_v8a',
EXT = 'android-arm64_v8a',
SO = 'so',
PLATFORM = 'android',
PLAT_INCDIR = '-I$(NDK_ROOT_DIR)/platforms/android-21/arch-arm64/usr/include -I$(NDK_ROOT_DIR)/sources/cxx-stl/gnu-libstdc++/4.9/include -I$(NDK_ROOT_DIR)/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include -I$(NDK_ROOT_DIR)/sources/cxx-stl/gnu-libstdc++/4.9/include/backward',
@ -134,7 +134,7 @@ local platforms = {
CXX = '$(NDK_ROOT_DIR)/toolchains/x86_64-4.9/prebuilt/' .. host .. '/bin/x86_64-linux-android-g++',
AS = '$(NDK_ROOT_DIR)/toolchains/x86_64-4.9/prebuilt/' .. host .. '/bin/x86_64-linux-android-as',
AR = '$(NDK_ROOT_DIR)/toolchains/x86_64-4.9/prebuilt/' .. host .. '/bin/x86_64-linux-android-ar',
EXT = 'android_x86_64',
EXT = 'android-x86_64',
SO = 'so',
PLATFORM = 'android',
PLAT_INCDIR = '-I$(NDK_ROOT_DIR)/platforms/android-21/arch-x86_64/usr/include -I$(NDK_ROOT_DIR)/sources/cxx-stl/gnu-libstdc++/4.9/include -I$(NDK_ROOT_DIR)/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86_64/include -I$(NDK_ROOT_DIR)/sources/cxx-stl/gnu-libstdc++/4.9/include/backward',
@ -153,7 +153,7 @@ local platforms = {
CXX = '$(NDK_ROOT_DIR)/toolchains/mips64el-linux-android-4.9/prebuilt/' .. host .. '/bin/mips64el-linux-android-g++',
AS = '$(NDK_ROOT_DIR)/toolchains/mips64el-linux-android-4.9/prebuilt/' .. host .. '/bin/mips64el-linux-android-as',
AR = '$(NDK_ROOT_DIR)/toolchains/mips64el-linux-android-4.9/prebuilt/' .. host .. '/bin/mips64el-linux-android-ar',
EXT = 'android_mips64',
EXT = 'android-mips64',
SO = 'so',
PLATFORM = 'android',
PLAT_INCDIR = '-I$(NDK_ROOT_DIR)/platforms/android-21/arch-mips64/usr/include -I$(NDK_ROOT_DIR)/sources/cxx-stl/gnu-libstdc++/4.9/include -I$(NDK_ROOT_DIR)/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips64/include -I$(NDK_ROOT_DIR)/sources/cxx-stl/gnu-libstdc++/4.9/include/backward',
@ -172,7 +172,7 @@ local platforms = {
CXX = '$(NDK_ROOT_DIR)/toolchains/arm-linux-androideabi-4.8/prebuilt/' .. host .. '/bin/arm-linux-androideabi-g++',
AS = '$(NDK_ROOT_DIR)/toolchains/arm-linux-androideabi-4.8/prebuilt/' .. host .. '/bin/arm-linux-androideabi-as',
AR = '$(NDK_ROOT_DIR)/toolchains/arm-linux-androideabi-4.8/prebuilt/' .. host .. '/bin/arm-linux-androideabi-ar',
EXT = 'armeabi-v7a',
EXT = 'android-armeabi_v7a',
SO = 'so',
PLATFORM = 'android',
PLAT_INCDIR = '-I$(NDK_ROOT_DIR)/platforms/android-3/arch-arm/usr/include -I$(NDK_ROOT_DIR)/sources/cxx-stl/gnu-libstdc++/4.8/include -I$(NDK_ROOT_DIR)/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi/include -I$(NDK_ROOT_DIR)/sources/cxx-stl/gnu-libstdc++/4.8/include/backward',
@ -191,7 +191,7 @@ local platforms = {
CXX = '$(NDK_ROOT_DIR)/toolchains/arm-linux-androideabi-4.8/prebuilt/' .. host .. '/bin/arm-linux-androideabi-g++',
AS = '$(NDK_ROOT_DIR)/toolchains/arm-linux-androideabi-4.8/prebuilt/' .. host .. '/bin/arm-linux-androideabi-as',
AR = '$(NDK_ROOT_DIR)/toolchains/arm-linux-androideabi-4.8/prebuilt/' .. host .. '/bin/arm-linux-androideabi-ar',
EXT = 'armeabi',
EXT = 'android-armeabi',
SO = 'so',
PLATFORM = 'android',
PLAT_INCDIR = '-I$(NDK_ROOT_DIR)/platforms/android-3/arch-arm/usr/include -I$(NDK_ROOT_DIR)/sources/cxx-stl/gnu-libstdc++/4.8/include -I$(NDK_ROOT_DIR)/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi/include -I$(NDK_ROOT_DIR)/sources/cxx-stl/gnu-libstdc++/4.8/include/backward',
@ -210,7 +210,7 @@ local platforms = {
CXX = '$(NDK_ROOT_DIR)/toolchains/x86-4.8/prebuilt/' .. host .. '/bin/i686-linux-android-g++',
AS = '$(NDK_ROOT_DIR)/toolchains/x86-4.8/prebuilt/' .. host .. '/bin/i686-linux-android-as',
AR = '$(NDK_ROOT_DIR)/toolchains/x86-4.8/prebuilt/' .. host .. '/bin/i686-linux-android-ar',
EXT = 'x86',
EXT = 'android-x86',
SO = 'so',
PLATFORM = 'android',
PLAT_INCDIR = '-I$(NDK_ROOT_DIR)/platforms/android-9/arch-x86/usr/include -I$(NDK_ROOT_DIR)/sources/cxx-stl/gnu-libstdc++/4.8/include $(NDK_ROOT_DIR)/sources/cxx-stl/gnu-libstdc++/4.8/libs/x86/include -I$(NDK_ROOT_DIR)/sources/cxx-stl/gnu-libstdc++/4.8/include/backward',
@ -229,7 +229,7 @@ local platforms = {
CXX = '$(NDK_ROOT_DIR)/toolchains/mipsel-linux-android-4.8/prebuilt/' .. host .. '/bin/mipsel-linux-android-g++',
AS = '$(NDK_ROOT_DIR)/toolchains/mipsel-linux-android-4.8/prebuilt/' .. host .. '/bin/mipsel-linux-android-as',
AR = '$(NDK_ROOT_DIR)/toolchains/mipsel-linux-android-4.8/prebuilt/' .. host .. '/bin/mipsel-linux-android-ar',
EXT = 'android_mips',
EXT = 'android-mips',
SO = 'so',
PLATFORM = 'android',
PLAT_INCDIR = '-I$(NDK_ROOT_DIR)/platforms/android-9/arch-mips/usr/include -I$(NDK_ROOT_DIR)/sources/cxx-stl/gnu-libstdc++/4.8/include -I$(NDK_ROOT_DIR)/sources/cxx-stl/gnu-libstdc++/4.8/libs/mips/include -I$(NDK_ROOT_DIR)/sources/cxx-stl/gnu-libstdc++/4.8/include/backward',
@ -248,7 +248,7 @@ local platforms = {
CXX = 'g++',
AS = 'as',
AR = 'ar',
EXT = 'linux_x86',
EXT = 'linux-x86',
SO = 'so',
PLATFORM = 'unix',
PLAT_INCDIR = '',
@ -267,7 +267,7 @@ local platforms = {
CXX = 'g++',
AS = 'as',
AR = 'ar',
EXT = 'linux_x86',
EXT = 'linux_portable-x86',
SO = 'so',
PLATFORM = 'unix',
PLAT_INCDIR = '',
@ -286,7 +286,7 @@ local platforms = {
CXX = 'g++',
AS = 'as',
AR = 'ar',
EXT = 'linux_x86_64',
EXT = 'linux-x86_64',
SO = 'so',
PLATFORM = 'unix',
PLAT_INCDIR = '',
@ -305,7 +305,7 @@ local platforms = {
CXX = 'g++',
AS = 'as',
AR = 'ar',
EXT = 'linux_x86_64',
EXT = 'linux_portable-x86_64',
SO = 'so',
PLATFORM = 'unix',
PLAT_INCDIR = '',
@ -324,7 +324,7 @@ local platforms = {
CXX = 'i686-w64-mingw32-g++',
AS = 'i686-w64-mingw32-as',
AR = 'i686-w64-mingw32-ar',
EXT = 'windows_x86',
EXT = 'windows-x86',
SO = 'dll',
PLATFORM = 'win',
PLAT_INCDIR = '',
@ -343,7 +343,7 @@ local platforms = {
CXX = 'x86_64-w64-mingw32-g++',
AS = 'x86_64-w64-mingw32-as',
AR = 'x86_64-w64-mingw32-ar',
EXT = 'windows_x86_64',
EXT = 'windows-x86_64',
SO = 'dll',
PLATFORM = 'win',
PLAT_INCDIR = '',