diff --git a/CMakeLists.txt b/CMakeLists.txt index 11f6b9111..16e90cb2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,7 @@ PROJECT( tomahawk ) CMAKE_MINIMUM_REQUIRED( VERSION 2.8 ) SET( CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" ) +SET( THIRDPARTY_DIR ${CMAKE_SOURCE_DIR}/thirdparty ) # Check if we need qtgui: IF( "${gui}" STREQUAL "no" ) @@ -22,14 +23,6 @@ FIND_PACKAGE( LibEchonest 1.1.1 REQUIRED ) FIND_PACKAGE( CLucene REQUIRED ) FIND_PACKAGE( Gloox 1.0 REQUIRED ) -IF( UNIX AND NOT APPLE ) - ADD_SUBDIRECTORY( alsa-playback ) -ELSE() - ADD_SUBDIRECTORY( rtaudio ) -ENDIF( UNIX AND NOT APPLE ) - ADD_SUBDIRECTORY( thirdparty ) -ADD_SUBDIRECTORY( libportfwd ) -ADD_SUBDIRECTORY( qxt ) ADD_SUBDIRECTORY( src/libtomahawk ) ADD_SUBDIRECTORY( src ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b2b261cfc..71a9f1eaa 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -122,11 +122,11 @@ INCLUDE_DIRECTORIES( libtomahawk/utils mac - ../alsa-playback - ../rtaudio - ../qxt/qxtweb-standalone/qxtweb - ../thirdparty/qtweetlib/qtweetlib/src - ../thirdparty/qtweetlib/tomahawk-custom + ${THIRDPARTY_DIR}/alsa-playback + ${THIRDPARTY_DIR}/rtaudio + ${THIRDPARTY_DIR}/qxt/qxtweb-standalone/qxtweb/ + ${THIRDPARTY_DIR}/qtweetlib/qtweetlib/src + ${THIRDPARTY_DIR}/qtweetlib/tomahawk-custom /usr/include/taglib /usr/local/include/taglib diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index 265a2417b..f40159bd5 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/src/libtomahawk/CMakeLists.txt @@ -295,23 +295,25 @@ set( libUI ${libUI} playlist/infobar/infobar.ui ) -include_directories( . ${CMAKE_CURRENT_BINARY_DIR} .. +include_directories( . ${CMAKE_CURRENT_BINARY_DIR} .. ${QT_INCLUDE_DIR} ${LIBECHONEST_INCLUDE_DIR} ${LIBECHONEST_INCLUDE_DIR}/.. ${CLUCENE_INCLUDE_DIR} ${CLUCENE_LIBRARY_DIR} - ../../libportfwd/include + ../../include ../network - ../../qxt/qxtweb-standalone/qxtweb - ../../rtaudio - ../../alsa-playback - ../../thirdparty/jdns - ../../thirdparty/jdns/jdns - ../../thirdparty/jdns/jdnsshared - ../../thirdparty/qtweetlib/qtweetlib/src playlist + + ${THIRDPARTY_DIR}/libportfwd/include + ${THIRDPARTY_DIR}/qxt/qxtweb-standalone/qxtweb + ${THIRDPARTY_DIR}/rtaudio + ${THIRDPARTY_DIR}/alsa-playback + ${THIRDPARTY_DIR}/jdns + ${THIRDPARTY_DIR}/jdns/jdns + ${THIRDPARTY_DIR}/jdns/jdnsshared + ${THIRDPARTY_DIR}/qtweetlib/qtweetlib/src ) diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index e3e0fdc91..2d2836537 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -1,2 +1,10 @@ add_subdirectory( jdns ) add_subdirectory( qtweetlib ) +ADD_SUBDIRECTORY( libportfwd ) +ADD_SUBDIRECTORY( qxt ) + +IF( UNIX AND NOT APPLE ) + ADD_SUBDIRECTORY( alsa-playback ) +ELSE() + ADD_SUBDIRECTORY( rtaudio ) +ENDIF( UNIX AND NOT APPLE ) diff --git a/alsa-playback/CMakeLists.txt b/thirdparty/alsa-playback/CMakeLists.txt similarity index 100% rename from alsa-playback/CMakeLists.txt rename to thirdparty/alsa-playback/CMakeLists.txt diff --git a/alsa-playback/alsaaudio.cpp b/thirdparty/alsa-playback/alsaaudio.cpp similarity index 100% rename from alsa-playback/alsaaudio.cpp rename to thirdparty/alsa-playback/alsaaudio.cpp diff --git a/alsa-playback/alsaaudio.h b/thirdparty/alsa-playback/alsaaudio.h similarity index 100% rename from alsa-playback/alsaaudio.h rename to thirdparty/alsa-playback/alsaaudio.h diff --git a/alsa-playback/alsaplayback.cpp b/thirdparty/alsa-playback/alsaplayback.cpp similarity index 100% rename from alsa-playback/alsaplayback.cpp rename to thirdparty/alsa-playback/alsaplayback.cpp diff --git a/alsa-playback/alsaplayback.h b/thirdparty/alsa-playback/alsaplayback.h similarity index 100% rename from alsa-playback/alsaplayback.h rename to thirdparty/alsa-playback/alsaplayback.h diff --git a/alsa-playback/xconvert.c b/thirdparty/alsa-playback/xconvert.c similarity index 100% rename from alsa-playback/xconvert.c rename to thirdparty/alsa-playback/xconvert.c diff --git a/alsa-playback/xconvert.h b/thirdparty/alsa-playback/xconvert.h similarity index 100% rename from alsa-playback/xconvert.h rename to thirdparty/alsa-playback/xconvert.h diff --git a/libportfwd/CMakeLists.txt b/thirdparty/libportfwd/CMakeLists.txt similarity index 100% rename from libportfwd/CMakeLists.txt rename to thirdparty/libportfwd/CMakeLists.txt diff --git a/libportfwd/README b/thirdparty/libportfwd/README similarity index 100% rename from libportfwd/README rename to thirdparty/libportfwd/README diff --git a/libportfwd/include/portfwd/portfwd.h b/thirdparty/libportfwd/include/portfwd/portfwd.h similarity index 100% rename from libportfwd/include/portfwd/portfwd.h rename to thirdparty/libportfwd/include/portfwd/portfwd.h diff --git a/libportfwd/src/main.cpp b/thirdparty/libportfwd/src/main.cpp similarity index 100% rename from libportfwd/src/main.cpp rename to thirdparty/libportfwd/src/main.cpp diff --git a/libportfwd/src/portfwd.cpp b/thirdparty/libportfwd/src/portfwd.cpp similarity index 100% rename from libportfwd/src/portfwd.cpp rename to thirdparty/libportfwd/src/portfwd.cpp diff --git a/libportfwd/third-party/libnatpmp-20100202/Changelog.txt b/thirdparty/libportfwd/third-party/libnatpmp-20100202/Changelog.txt similarity index 100% rename from libportfwd/third-party/libnatpmp-20100202/Changelog.txt rename to thirdparty/libportfwd/third-party/libnatpmp-20100202/Changelog.txt diff --git a/libportfwd/third-party/libnatpmp-20100202/LICENSE b/thirdparty/libportfwd/third-party/libnatpmp-20100202/LICENSE similarity index 100% rename from libportfwd/third-party/libnatpmp-20100202/LICENSE rename to thirdparty/libportfwd/third-party/libnatpmp-20100202/LICENSE diff --git a/libportfwd/third-party/libnatpmp-20100202/README b/thirdparty/libportfwd/third-party/libnatpmp-20100202/README similarity index 100% rename from libportfwd/third-party/libnatpmp-20100202/README rename to thirdparty/libportfwd/third-party/libnatpmp-20100202/README diff --git a/libportfwd/third-party/libnatpmp-20100202/build.bat b/thirdparty/libportfwd/third-party/libnatpmp-20100202/build.bat similarity index 100% rename from libportfwd/third-party/libnatpmp-20100202/build.bat rename to thirdparty/libportfwd/third-party/libnatpmp-20100202/build.bat diff --git a/libportfwd/third-party/libnatpmp-20100202/declspec.h b/thirdparty/libportfwd/third-party/libnatpmp-20100202/declspec.h similarity index 100% rename from libportfwd/third-party/libnatpmp-20100202/declspec.h rename to thirdparty/libportfwd/third-party/libnatpmp-20100202/declspec.h diff --git a/libportfwd/third-party/libnatpmp-20100202/getgateway.c b/thirdparty/libportfwd/third-party/libnatpmp-20100202/getgateway.c similarity index 100% rename from libportfwd/third-party/libnatpmp-20100202/getgateway.c rename to thirdparty/libportfwd/third-party/libnatpmp-20100202/getgateway.c diff --git a/libportfwd/third-party/libnatpmp-20100202/getgateway.h b/thirdparty/libportfwd/third-party/libnatpmp-20100202/getgateway.h similarity index 100% rename from libportfwd/third-party/libnatpmp-20100202/getgateway.h rename to thirdparty/libportfwd/third-party/libnatpmp-20100202/getgateway.h diff --git a/libportfwd/third-party/libnatpmp-20100202/libnatpmpmodule.c b/thirdparty/libportfwd/third-party/libnatpmp-20100202/libnatpmpmodule.c similarity index 100% rename from libportfwd/third-party/libnatpmp-20100202/libnatpmpmodule.c rename to thirdparty/libportfwd/third-party/libnatpmp-20100202/libnatpmpmodule.c diff --git a/libportfwd/third-party/libnatpmp-20100202/msvc/libnatpmp.sln b/thirdparty/libportfwd/third-party/libnatpmp-20100202/msvc/libnatpmp.sln similarity index 100% rename from libportfwd/third-party/libnatpmp-20100202/msvc/libnatpmp.sln rename to thirdparty/libportfwd/third-party/libnatpmp-20100202/msvc/libnatpmp.sln diff --git a/libportfwd/third-party/libnatpmp-20100202/msvc/libnatpmp.vcproj b/thirdparty/libportfwd/third-party/libnatpmp-20100202/msvc/libnatpmp.vcproj similarity index 100% rename from libportfwd/third-party/libnatpmp-20100202/msvc/libnatpmp.vcproj rename to thirdparty/libportfwd/third-party/libnatpmp-20100202/msvc/libnatpmp.vcproj diff --git a/libportfwd/third-party/libnatpmp-20100202/msvc/natpmpc-static.vcproj b/thirdparty/libportfwd/third-party/libnatpmp-20100202/msvc/natpmpc-static.vcproj similarity index 100% rename from libportfwd/third-party/libnatpmp-20100202/msvc/natpmpc-static.vcproj rename to thirdparty/libportfwd/third-party/libnatpmp-20100202/msvc/natpmpc-static.vcproj diff --git a/libportfwd/third-party/libnatpmp-20100202/natpmp.c b/thirdparty/libportfwd/third-party/libnatpmp-20100202/natpmp.c similarity index 100% rename from libportfwd/third-party/libnatpmp-20100202/natpmp.c rename to thirdparty/libportfwd/third-party/libnatpmp-20100202/natpmp.c diff --git a/libportfwd/third-party/libnatpmp-20100202/natpmp.def b/thirdparty/libportfwd/third-party/libnatpmp-20100202/natpmp.def similarity index 100% rename from libportfwd/third-party/libnatpmp-20100202/natpmp.def rename to thirdparty/libportfwd/third-party/libnatpmp-20100202/natpmp.def diff --git a/libportfwd/third-party/libnatpmp-20100202/natpmp.h b/thirdparty/libportfwd/third-party/libnatpmp-20100202/natpmp.h similarity index 100% rename from libportfwd/third-party/libnatpmp-20100202/natpmp.h rename to thirdparty/libportfwd/third-party/libnatpmp-20100202/natpmp.h diff --git a/libportfwd/third-party/libnatpmp-20100202/natpmpc.c b/thirdparty/libportfwd/third-party/libnatpmp-20100202/natpmpc.c similarity index 100% rename from libportfwd/third-party/libnatpmp-20100202/natpmpc.c rename to thirdparty/libportfwd/third-party/libnatpmp-20100202/natpmpc.c diff --git a/libportfwd/third-party/libnatpmp-20100202/setup.py b/thirdparty/libportfwd/third-party/libnatpmp-20100202/setup.py similarity index 100% rename from libportfwd/third-party/libnatpmp-20100202/setup.py rename to thirdparty/libportfwd/third-party/libnatpmp-20100202/setup.py diff --git a/libportfwd/third-party/libnatpmp-20100202/setupmingw32.py b/thirdparty/libportfwd/third-party/libnatpmp-20100202/setupmingw32.py similarity index 100% rename from libportfwd/third-party/libnatpmp-20100202/setupmingw32.py rename to thirdparty/libportfwd/third-party/libnatpmp-20100202/setupmingw32.py diff --git a/libportfwd/third-party/libnatpmp-20100202/testgetgateway.c b/thirdparty/libportfwd/third-party/libnatpmp-20100202/testgetgateway.c similarity index 100% rename from libportfwd/third-party/libnatpmp-20100202/testgetgateway.c rename to thirdparty/libportfwd/third-party/libnatpmp-20100202/testgetgateway.c diff --git a/libportfwd/third-party/libnatpmp-20100202/wingettimeofday.c b/thirdparty/libportfwd/third-party/libnatpmp-20100202/wingettimeofday.c similarity index 100% rename from libportfwd/third-party/libnatpmp-20100202/wingettimeofday.c rename to thirdparty/libportfwd/third-party/libnatpmp-20100202/wingettimeofday.c diff --git a/libportfwd/third-party/libnatpmp-20100202/wingettimeofday.h b/thirdparty/libportfwd/third-party/libnatpmp-20100202/wingettimeofday.h similarity index 100% rename from libportfwd/third-party/libnatpmp-20100202/wingettimeofday.h rename to thirdparty/libportfwd/third-party/libnatpmp-20100202/wingettimeofday.h diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/Changelog.txt b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/Changelog.txt similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/Changelog.txt rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/Changelog.txt diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/LICENSE b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/LICENSE similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/LICENSE rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/LICENSE diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/README b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/README similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/README rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/README diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/VERSION b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/VERSION similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/VERSION rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/VERSION diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/bsdqueue.h b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/bsdqueue.h similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/bsdqueue.h rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/bsdqueue.h diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/codelength.h b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/codelength.h similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/codelength.h rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/codelength.h diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/connecthostport.c b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/connecthostport.c similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/connecthostport.c rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/connecthostport.c diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/connecthostport.h b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/connecthostport.h similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/connecthostport.h rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/connecthostport.h diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/declspec.h b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/declspec.h similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/declspec.h rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/declspec.h diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/igd_desc_parse.c b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/igd_desc_parse.c similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/igd_desc_parse.c rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/igd_desc_parse.c diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/igd_desc_parse.h b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/igd_desc_parse.h similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/igd_desc_parse.h rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/igd_desc_parse.h diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/java/JavaBridgeTest.java b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/java/JavaBridgeTest.java similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/java/JavaBridgeTest.java rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/java/JavaBridgeTest.java diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/java/testjava.sh b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/java/testjava.sh similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/java/testjava.sh rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/java/testjava.sh diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/man3/miniupnpc.3 b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/man3/miniupnpc.3 similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/man3/miniupnpc.3 rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/man3/miniupnpc.3 diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/mingw32make.bat b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/mingw32make.bat similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/mingw32make.bat rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/mingw32make.bat diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/minisoap.c b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/minisoap.c similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/minisoap.c rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/minisoap.c diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/minisoap.h b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/minisoap.h similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/minisoap.h rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/minisoap.h diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/minissdpc.c b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/minissdpc.c similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/minissdpc.c rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/minissdpc.c diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/minissdpc.h b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/minissdpc.h similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/minissdpc.h rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/minissdpc.h diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/miniupnpc.c b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/miniupnpc.c similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/miniupnpc.c rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/miniupnpc.c diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/miniupnpc.def b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/miniupnpc.def similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/miniupnpc.def rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/miniupnpc.def diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/miniupnpc.h b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/miniupnpc.h similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/miniupnpc.h rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/miniupnpc.h diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/miniupnpcmodule.c b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/miniupnpcmodule.c similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/miniupnpcmodule.c rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/miniupnpcmodule.c diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/miniupnpcstrings.h b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/miniupnpcstrings.h similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/miniupnpcstrings.h rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/miniupnpcstrings.h diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/miniupnpcstrings.h.in b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/miniupnpcstrings.h.in similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/miniupnpcstrings.h.in rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/miniupnpcstrings.h.in diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/miniwget.c b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/miniwget.c similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/miniwget.c rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/miniwget.c diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/miniwget.h b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/miniwget.h similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/miniwget.h rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/miniwget.h diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/minixml.c b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/minixml.c similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/minixml.c rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/minixml.c diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/minixml.h b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/minixml.h similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/minixml.h rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/minixml.h diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/minixmlvalid.c b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/minixmlvalid.c similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/minixmlvalid.c rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/minixmlvalid.c diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/msvc/miniupnpc.sln b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/msvc/miniupnpc.sln similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/msvc/miniupnpc.sln rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/msvc/miniupnpc.sln diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/msvc/miniupnpc.vcproj b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/msvc/miniupnpc.vcproj similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/msvc/miniupnpc.vcproj rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/msvc/miniupnpc.vcproj diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/msvc/upnpc-static.vcproj b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/msvc/upnpc-static.vcproj similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/msvc/upnpc-static.vcproj rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/msvc/upnpc-static.vcproj diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/pymoduletest.py b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/pymoduletest.py similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/pymoduletest.py rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/pymoduletest.py diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/setup.py b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/setup.py similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/setup.py rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/setup.py diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/setupmingw32.py b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/setupmingw32.py similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/setupmingw32.py rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/setupmingw32.py diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/testigddescparse.c b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/testigddescparse.c similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/testigddescparse.c rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/testigddescparse.c diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/testminiwget.c b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/testminiwget.c similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/testminiwget.c rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/testminiwget.c diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/testminixml.c b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/testminixml.c similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/testminixml.c rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/testminixml.c diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/testupnpigd.py b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/testupnpigd.py similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/testupnpigd.py rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/testupnpigd.py diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/testupnpreplyparse.c b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/testupnpreplyparse.c similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/testupnpreplyparse.c rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/testupnpreplyparse.c diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/updateminiupnpcstrings.sh b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/updateminiupnpcstrings.sh similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/updateminiupnpcstrings.sh rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/updateminiupnpcstrings.sh diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/upnpc.c b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/upnpc.c similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/upnpc.c rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/upnpc.c diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/upnpcommands.c b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/upnpcommands.c similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/upnpcommands.c rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/upnpcommands.c diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/upnpcommands.h b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/upnpcommands.h similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/upnpcommands.h rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/upnpcommands.h diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/upnperrors.c b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/upnperrors.c similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/upnperrors.c rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/upnperrors.c diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/upnperrors.h b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/upnperrors.h similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/upnperrors.h rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/upnperrors.h diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/upnpreplyparse.c b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/upnpreplyparse.c similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/upnpreplyparse.c rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/upnpreplyparse.c diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/upnpreplyparse.h b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/upnpreplyparse.h similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/upnpreplyparse.h rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/upnpreplyparse.h diff --git a/libportfwd/third-party/miniupnpc-1.4.20100609/wingenminiupnpcstrings.c b/thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/wingenminiupnpcstrings.c similarity index 100% rename from libportfwd/third-party/miniupnpc-1.4.20100609/wingenminiupnpcstrings.c rename to thirdparty/libportfwd/third-party/miniupnpc-1.4.20100609/wingenminiupnpcstrings.c diff --git a/qxt/CMakeLists.txt b/thirdparty/qxt/CMakeLists.txt similarity index 100% rename from qxt/CMakeLists.txt rename to thirdparty/qxt/CMakeLists.txt diff --git a/qxt/qxtweb-standalone/CMakeLists.txt b/thirdparty/qxt/qxtweb-standalone/CMakeLists.txt similarity index 100% rename from qxt/qxtweb-standalone/CMakeLists.txt rename to thirdparty/qxt/qxtweb-standalone/CMakeLists.txt diff --git a/qxt/qxtweb-standalone/README.txt b/thirdparty/qxt/qxtweb-standalone/README.txt similarity index 100% rename from qxt/qxtweb-standalone/README.txt rename to thirdparty/qxt/qxtweb-standalone/README.txt diff --git a/qxt/qxtweb-standalone/example/main.cpp b/thirdparty/qxt/qxtweb-standalone/example/main.cpp similarity index 100% rename from qxt/qxtweb-standalone/example/main.cpp rename to thirdparty/qxt/qxtweb-standalone/example/main.cpp diff --git a/qxt/qxtweb-standalone/example/myservice.h b/thirdparty/qxt/qxtweb-standalone/example/myservice.h similarity index 100% rename from qxt/qxtweb-standalone/example/myservice.h rename to thirdparty/qxt/qxtweb-standalone/example/myservice.h diff --git a/qxt/qxtweb-standalone/qxtweb/QxtAbstractHttpConnector b/thirdparty/qxt/qxtweb-standalone/qxtweb/QxtAbstractHttpConnector similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/QxtAbstractHttpConnector rename to thirdparty/qxt/qxtweb-standalone/qxtweb/QxtAbstractHttpConnector diff --git a/qxt/qxtweb-standalone/qxtweb/QxtAbstractWebService b/thirdparty/qxt/qxtweb-standalone/qxtweb/QxtAbstractWebService similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/QxtAbstractWebService rename to thirdparty/qxt/qxtweb-standalone/qxtweb/QxtAbstractWebService diff --git a/qxt/qxtweb-standalone/qxtweb/QxtAbstractWebSessionManager b/thirdparty/qxt/qxtweb-standalone/qxtweb/QxtAbstractWebSessionManager similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/QxtAbstractWebSessionManager rename to thirdparty/qxt/qxtweb-standalone/qxtweb/QxtAbstractWebSessionManager diff --git a/qxt/qxtweb-standalone/qxtweb/QxtHtmlTemplate b/thirdparty/qxt/qxtweb-standalone/qxtweb/QxtHtmlTemplate similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/QxtHtmlTemplate rename to thirdparty/qxt/qxtweb-standalone/qxtweb/QxtHtmlTemplate diff --git a/qxt/qxtweb-standalone/qxtweb/QxtHttpServerConnector b/thirdparty/qxt/qxtweb-standalone/qxtweb/QxtHttpServerConnector similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/QxtHttpServerConnector rename to thirdparty/qxt/qxtweb-standalone/qxtweb/QxtHttpServerConnector diff --git a/qxt/qxtweb-standalone/qxtweb/QxtHttpSessionManager b/thirdparty/qxt/qxtweb-standalone/qxtweb/QxtHttpSessionManager similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/QxtHttpSessionManager rename to thirdparty/qxt/qxtweb-standalone/qxtweb/QxtHttpSessionManager diff --git a/qxt/qxtweb-standalone/qxtweb/QxtMail b/thirdparty/qxt/qxtweb-standalone/qxtweb/QxtMail similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/QxtMail rename to thirdparty/qxt/qxtweb-standalone/qxtweb/QxtMail diff --git a/qxt/qxtweb-standalone/qxtweb/QxtScgiServerConnector b/thirdparty/qxt/qxtweb-standalone/qxtweb/QxtScgiServerConnector similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/QxtScgiServerConnector rename to thirdparty/qxt/qxtweb-standalone/qxtweb/QxtScgiServerConnector diff --git a/qxt/qxtweb-standalone/qxtweb/QxtSendmail b/thirdparty/qxt/qxtweb-standalone/qxtweb/QxtSendmail similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/QxtSendmail rename to thirdparty/qxt/qxtweb-standalone/qxtweb/QxtSendmail diff --git a/qxt/qxtweb-standalone/qxtweb/QxtWeb b/thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWeb similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/QxtWeb rename to thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWeb diff --git a/qxt/qxtweb-standalone/qxtweb/QxtWebCgiService b/thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebCgiService similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/QxtWebCgiService rename to thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebCgiService diff --git a/qxt/qxtweb-standalone/qxtweb/QxtWebContent b/thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebContent similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/QxtWebContent rename to thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebContent diff --git a/qxt/qxtweb-standalone/qxtweb/QxtWebErrorEvent b/thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebErrorEvent similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/QxtWebErrorEvent rename to thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebErrorEvent diff --git a/qxt/qxtweb-standalone/qxtweb/QxtWebEvent b/thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebEvent similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/QxtWebEvent rename to thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebEvent diff --git a/qxt/qxtweb-standalone/qxtweb/QxtWebFileUploadEvent b/thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebFileUploadEvent similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/QxtWebFileUploadEvent rename to thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebFileUploadEvent diff --git a/qxt/qxtweb-standalone/qxtweb/QxtWebPageEvent b/thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebPageEvent similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/QxtWebPageEvent rename to thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebPageEvent diff --git a/qxt/qxtweb-standalone/qxtweb/QxtWebRedirectEvent b/thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebRedirectEvent similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/QxtWebRedirectEvent rename to thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebRedirectEvent diff --git a/qxt/qxtweb-standalone/qxtweb/QxtWebRemoveCookieEvent b/thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebRemoveCookieEvent similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/QxtWebRemoveCookieEvent rename to thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebRemoveCookieEvent diff --git a/qxt/qxtweb-standalone/qxtweb/QxtWebRequestEvent b/thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebRequestEvent similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/QxtWebRequestEvent rename to thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebRequestEvent diff --git a/qxt/qxtweb-standalone/qxtweb/QxtWebServiceDirectory b/thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebServiceDirectory similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/QxtWebServiceDirectory rename to thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebServiceDirectory diff --git a/qxt/qxtweb-standalone/qxtweb/QxtWebSlotService b/thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebSlotService similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/QxtWebSlotService rename to thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebSlotService diff --git a/qxt/qxtweb-standalone/qxtweb/QxtWebStoreCookieEvent b/thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebStoreCookieEvent similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/QxtWebStoreCookieEvent rename to thirdparty/qxt/qxtweb-standalone/qxtweb/QxtWebStoreCookieEvent diff --git a/qxt/qxtweb-standalone/qxtweb/qxtabstracthttpconnector.cpp b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtabstracthttpconnector.cpp similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtabstracthttpconnector.cpp rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtabstracthttpconnector.cpp diff --git a/qxt/qxtweb-standalone/qxtweb/qxtabstracthttpconnector.h b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtabstracthttpconnector.h similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtabstracthttpconnector.h rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtabstracthttpconnector.h diff --git a/qxt/qxtweb-standalone/qxtweb/qxtabstractwebservice.cpp b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtabstractwebservice.cpp similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtabstractwebservice.cpp rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtabstractwebservice.cpp diff --git a/qxt/qxtweb-standalone/qxtweb/qxtabstractwebservice.h b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtabstractwebservice.h similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtabstractwebservice.h rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtabstractwebservice.h diff --git a/qxt/qxtweb-standalone/qxtweb/qxtabstractwebsessionmanager.cpp b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtabstractwebsessionmanager.cpp similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtabstractwebsessionmanager.cpp rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtabstractwebsessionmanager.cpp diff --git a/qxt/qxtweb-standalone/qxtweb/qxtabstractwebsessionmanager.h b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtabstractwebsessionmanager.h similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtabstractwebsessionmanager.h rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtabstractwebsessionmanager.h diff --git a/qxt/qxtweb-standalone/qxtweb/qxtabstractwebsessionmanager_p.h b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtabstractwebsessionmanager_p.h similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtabstractwebsessionmanager_p.h rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtabstractwebsessionmanager_p.h diff --git a/qxt/qxtweb-standalone/qxtweb/qxtboundcfunction.h b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtboundcfunction.h similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtboundcfunction.h rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtboundcfunction.h diff --git a/qxt/qxtweb-standalone/qxtweb/qxtboundfunction.h b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtboundfunction.h similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtboundfunction.h rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtboundfunction.h diff --git a/qxt/qxtweb-standalone/qxtweb/qxtboundfunctionbase.h b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtboundfunctionbase.h similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtboundfunctionbase.h rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtboundfunctionbase.h diff --git a/qxt/qxtweb-standalone/qxtweb/qxtglobal.cpp b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtglobal.cpp similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtglobal.cpp rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtglobal.cpp diff --git a/qxt/qxtweb-standalone/qxtweb/qxtglobal.h b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtglobal.h similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtglobal.h rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtglobal.h diff --git a/qxt/qxtweb-standalone/qxtweb/qxthtmltemplate.cpp b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxthtmltemplate.cpp similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxthtmltemplate.cpp rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxthtmltemplate.cpp diff --git a/qxt/qxtweb-standalone/qxtweb/qxthtmltemplate.h b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxthtmltemplate.h similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxthtmltemplate.h rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxthtmltemplate.h diff --git a/qxt/qxtweb-standalone/qxtweb/qxthttpserverconnector.cpp b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxthttpserverconnector.cpp similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxthttpserverconnector.cpp rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxthttpserverconnector.cpp diff --git a/qxt/qxtweb-standalone/qxtweb/qxthttpsessionmanager.cpp b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxthttpsessionmanager.cpp similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxthttpsessionmanager.cpp rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxthttpsessionmanager.cpp diff --git a/qxt/qxtweb-standalone/qxtweb/qxthttpsessionmanager.h b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxthttpsessionmanager.h similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxthttpsessionmanager.h rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxthttpsessionmanager.h diff --git a/qxt/qxtweb-standalone/qxtweb/qxtmetaobject.cpp b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtmetaobject.cpp similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtmetaobject.cpp rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtmetaobject.cpp diff --git a/qxt/qxtweb-standalone/qxtweb/qxtmetaobject.h b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtmetaobject.h similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtmetaobject.h rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtmetaobject.h diff --git a/qxt/qxtweb-standalone/qxtweb/qxtmetatype.h b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtmetatype.h similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtmetatype.h rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtmetatype.h diff --git a/qxt/qxtweb-standalone/qxtweb/qxtnull.cpp b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtnull.cpp similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtnull.cpp rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtnull.cpp diff --git a/qxt/qxtweb-standalone/qxtweb/qxtnull.h b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtnull.h similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtnull.h rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtnull.h diff --git a/qxt/qxtweb-standalone/qxtweb/qxtnullable.h b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtnullable.h similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtnullable.h rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtnullable.h diff --git a/qxt/qxtweb-standalone/qxtweb/qxtscgiserverconnector.cpp b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtscgiserverconnector.cpp similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtscgiserverconnector.cpp rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtscgiserverconnector.cpp diff --git a/qxt/qxtweb-standalone/qxtweb/qxtweb.h b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtweb.h similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtweb.h rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtweb.h diff --git a/qxt/qxtweb-standalone/qxtweb/qxtwebcgiservice.cpp b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtwebcgiservice.cpp similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtwebcgiservice.cpp rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtwebcgiservice.cpp diff --git a/qxt/qxtweb-standalone/qxtweb/qxtwebcgiservice.h b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtwebcgiservice.h similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtwebcgiservice.h rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtwebcgiservice.h diff --git a/qxt/qxtweb-standalone/qxtweb/qxtwebcgiservice_p.h b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtwebcgiservice_p.h similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtwebcgiservice_p.h rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtwebcgiservice_p.h diff --git a/qxt/qxtweb-standalone/qxtweb/qxtwebcontent.cpp b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtwebcontent.cpp similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtwebcontent.cpp rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtwebcontent.cpp diff --git a/qxt/qxtweb-standalone/qxtweb/qxtwebcontent.h b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtwebcontent.h similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtwebcontent.h rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtwebcontent.h diff --git a/qxt/qxtweb-standalone/qxtweb/qxtwebevent.cpp b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtwebevent.cpp similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtwebevent.cpp rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtwebevent.cpp diff --git a/qxt/qxtweb-standalone/qxtweb/qxtwebevent.h b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtwebevent.h similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtwebevent.h rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtwebevent.h diff --git a/qxt/qxtweb-standalone/qxtweb/qxtwebservicedirectory.cpp b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtwebservicedirectory.cpp similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtwebservicedirectory.cpp rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtwebservicedirectory.cpp diff --git a/qxt/qxtweb-standalone/qxtweb/qxtwebservicedirectory.h b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtwebservicedirectory.h similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtwebservicedirectory.h rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtwebservicedirectory.h diff --git a/qxt/qxtweb-standalone/qxtweb/qxtwebservicedirectory_p.h b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtwebservicedirectory_p.h similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtwebservicedirectory_p.h rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtwebservicedirectory_p.h diff --git a/qxt/qxtweb-standalone/qxtweb/qxtwebslotservice.cpp b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtwebslotservice.cpp similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtwebslotservice.cpp rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtwebslotservice.cpp diff --git a/qxt/qxtweb-standalone/qxtweb/qxtwebslotservice.h b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtwebslotservice.h similarity index 100% rename from qxt/qxtweb-standalone/qxtweb/qxtwebslotservice.h rename to thirdparty/qxt/qxtweb-standalone/qxtweb/qxtwebslotservice.h diff --git a/rtaudio/CMakeLists.txt b/thirdparty/rtaudio/CMakeLists.txt similarity index 100% rename from rtaudio/CMakeLists.txt rename to thirdparty/rtaudio/CMakeLists.txt diff --git a/rtaudio/RtAudio.cpp b/thirdparty/rtaudio/RtAudio.cpp similarity index 100% rename from rtaudio/RtAudio.cpp rename to thirdparty/rtaudio/RtAudio.cpp diff --git a/rtaudio/RtAudio.h b/thirdparty/rtaudio/RtAudio.h similarity index 100% rename from rtaudio/RtAudio.h rename to thirdparty/rtaudio/RtAudio.h diff --git a/rtaudio/RtError.h b/thirdparty/rtaudio/RtError.h similarity index 100% rename from rtaudio/RtError.h rename to thirdparty/rtaudio/RtError.h diff --git a/rtaudio/readme b/thirdparty/rtaudio/readme similarity index 100% rename from rtaudio/readme rename to thirdparty/rtaudio/readme