Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-16 06:00:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix leftover method define, make apk creation a sep target

Browse source
This commit is contained in:
Stephen Birarda 2014-11-18 12:09:57 -08:00
parent 5c9c89826e
commit 9fd6fe49a4
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmake/android/QtCreateAPK.cmake
View file

@ -76,7 +76,8 @@ macro(qt_create_apk)
configure_file("${ANDROID_THIS_DIRECTORY}/deployment-file.json.in" "${TARGET_NAME}-deployment.json") configure_file("${ANDROID_THIS_DIRECTORY}/deployment-file.json.in" "${TARGET_NAME}-deployment.json")
# use androiddeployqt to create the apk # use androiddeployqt to create the apk
add_custom_command(TARGET ${TARGET_NAME} add_custom_target(${TARGET_NAME}-apk
COMMAND ${ANDROID_DEPLOY_QT} --input "${TARGET_NAME}-deployment.json" --output "${ANDROID_APK_OUTPUT_DIR}" --android-platform android-${ANDROID_API_LEVEL} --install --deployment bundled "\\$(ARGS)" COMMAND ${ANDROID_DEPLOY_QT} --input "${TARGET_NAME}-deployment.json" --output "${ANDROID_APK_OUTPUT_DIR}" --android-platform android-${ANDROID_API_LEVEL} --install --deployment bundled "\\$(ARGS)"
DEPENDS ${TARGET_NAME}
) )
endmacro() endmacro()

2
gvr-interface/src/GVRInterface.h
View file

@ -18,8 +18,6 @@ class GVRInterface : public QGuiApplication {
Q_OBJECT Q_OBJECT
public: public:
GVRInterface(int argc, char* argv[]); GVRInterface(int argc, char* argv[]);
private slots:
void processDatagrams();
}; };
#endif // hifi_GVRInterface_h #endif // hifi_GVRInterface_h