Merge pull request #1 from tux3/master

Update from original

bootstrap-osx.sh

@@ -29,13 +29,15 @@ cp /usr/local/lib/libav* libs/lib
 cp /usr/local/lib/libswscale* libs/lib
 cp /usr/local/lib/libqrencode* libs/lib
 cp /usr/local/lib/libfilteraudio* libs/lib
-cp /usr/local/include/filter_audio* libs/include
+cp /usr/local/lib/libsqlcipher* libs/lib
 echo Copying include files...
+cp /usr/local/include/filter_audio* libs/include
 cp -r /usr/local/include/tox* libs/include
 cp -r /usr/local/include/vpx* libs/include
 cp -r /usr/local/include/sodium* libs/include
 cp -r /usr/local/include/qrencode* libs/include
 cp -r /usr/local/include/libav* libs/include
 cp -r /usr/local/include/libswscale* libs/include
+cp -r /usr/local/include/sqlcipher* libs/include
 echo Done.
 

qtox.pro

@@ -160,6 +160,7 @@ win32 {
         QMAKE_INFO_PLIST = osx/info.plist
         QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
         LIBS += -L$$PWD/libs/lib/ -ltoxcore -ltoxav -ltoxencryptsave -ltoxdns -lsodium -lvpx -lopus -framework OpenAL -lavformat -lavdevice -lavcodec -lavutil -lswscale -mmacosx-version-min=10.7
+        LIBS += -framework AVFoundation -framework Foundation -framework CoreMedia
         LIBS += -lqrencode -lsqlcipher
         contains(DEFINES, QTOX_PLATFORM_EXT) { LIBS += -framework IOKit -framework CoreFoundation }
         contains(DEFINES, QTOX_FILTER_AUDIO) { LIBS += -lfilteraudio }
@@ -462,7 +463,11 @@ macx {
         src/platform/install_osx.cpp
 
     HEADERS += \
-        src/platform/install_osx.h
+        src/platform/install_osx.h \
+        src/platform/camera/avfoundation.h
+
+    OBJECTIVE_SOURCES += \
+        src/platform/camera/avfoundation.mm
 }
 
 SOURCES += \