Merge branch 'master' into android-new-control-input-overlay

This commit is contained in:
Ryan Houdek
2013-11-24 17:10:24 -06:00
2 changed files with 20 additions and 14 deletions

View File

@ -187,6 +187,7 @@ if(ANDROID)
target_link_libraries(${DOLPHIN_EXE}
log
android
"-Wl,--no-warn-mismatch"
"-Wl,--whole-archive"
${LIBS}
"-Wl,--no-whole-archive"