diff options
Diffstat (limited to 'mkspecs/unsupported/android-g++/qmake.conf')
| -rw-r--r-- | mkspecs/unsupported/android-g++/qmake.conf | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/mkspecs/unsupported/android-g++/qmake.conf b/mkspecs/unsupported/android-g++/qmake.conf index 1955054880..71b843af7e 100644 --- a/mkspecs/unsupported/android-g++/qmake.conf +++ b/mkspecs/unsupported/android-g++/qmake.conf @@ -135,26 +135,26 @@ QMAKE_INCDIR_OPENGL_ES2 = QMAKE_LIBDIR_OPENGL_ES2 = -QMAKE_LINK = $$QMAKE_CXX -QMAKE_LINK_SHLIB = $$QMAKE_CXX -QMAKE_LFLAGS = $${ANDROID_TARGET_LDFLAGS} \ - -nostdlib \ - -L${ANDROID_PRODUCT_OUT}/obj/lib \ - -Wl,-rpath-link,${ANDROID_PRODUCT_OUT}/obj/lib +QMAKE_LINK = $$QMAKE_CXX +QMAKE_LINK_SHLIB = $$QMAKE_CXX +QMAKE_LFLAGS = $${ANDROID_TARGET_LDFLAGS} \ + -nostdlib \ + -L${ANDROID_PRODUCT_OUT}/obj/lib \ + -Wl,-rpath-link,${ANDROID_PRODUCT_OUT}/obj/lib -QMAKE_LFLAGS_PLUGIN = -Wl,-T,${ANDROID_BUILD_TOP}/build/core/armelf.xsc \ - -Wl,-shared,-Bsymbolic +QMAKE_LFLAGS_PLUGIN = -Wl,-T,${ANDROID_BUILD_TOP}/build/core/armelf.xsc \ + -Wl,-shared,-Bsymbolic #apparantly this file is missing from some builds. #it does work without, but this may change in future. #QMAKE_LFLAGS_APP = -Wl,-T,${ANDROID_BUILD_TOP}/build/core/armelf.xs \ -QMAKE_LFLAGS_APP = ${ANDROID_PRODUCT_OUT}/obj/lib/crtbegin_dynamic.o \ - ${ANDROID_PRODUCT_OUT}/obj/lib/crtend_android.o +QMAKE_LFLAGS_APP = ${ANDROID_PRODUCT_OUT}/obj/lib/crtbegin_dynamic.o \ + ${ANDROID_PRODUCT_OUT}/obj/lib/crtend_android.o -QMAKE_LFLAGS_SHLIB = -Wl,-T,${ANDROID_BUILD_TOP}/build/core/armelf.xsc \ - -Wl,-shared,-Bsymbolic \ - ${ANDROID_PRODUCT_OUT}/obj/lib/crtbegin_so.o \ - ${ANDROID_PRODUCT_OUT}/obj/lib/crtend_so.o +QMAKE_LFLAGS_SHLIB = -Wl,-T,${ANDROID_BUILD_TOP}/build/core/armelf.xsc \ + -Wl,-shared,-Bsymbolic \ + ${ANDROID_PRODUCT_OUT}/obj/lib/crtbegin_so.o \ + ${ANDROID_PRODUCT_OUT}/obj/lib/crtend_so.o QMAKE_LFLAGS_SONAME = QMAKE_LFLAGS_NOUNDEF = -Wl,--no-undefined @@ -174,12 +174,12 @@ QMAKE_LIBS_OPENGL = QMAKE_LIBS_OPENGL_ES1 = -lGLESv1_CM QMAKE_LIBS_OPENGL_ES2 = -lEGL -lGLESv2 $$QMAKE_LIBS -CONFIG += linux-android-9 android-9 linux-android android android-no-sdk android_app +CONFIG += linux-android-9 android-9 linux-android android android-no-sdk android_app load(qt_config) # we don't support exceptions, but right now this has no effect # you need to manually delete mkspecs/features/exceptions.prf -CONFIG -= exceptions -CONFIG += exceptions_off +CONFIG -= exceptions +CONFIG += exceptions_off |