Decided to remove square from mC2+plugins.sln since both square and cube builds the mC2.lib.

Cleaned up some #include so compiler (or anyone else) does not get confused :)

mC2+plugins.sln

@@ -32,11 +32,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oggdecoder", "src\contrib\o
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{092264AD-38B7-401D-8E67-B56756A141E4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "square", "src\square\player.vcproj", "{C7102EB1-7311-4B36-A7FF-89DD7F077FF9}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B2165720-B4B2-4F4B-9634-8C390C3CB4DB} = {B2165720-B4B2-4F4B-9634-8C390C3CB4DB}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "waveout", "src\contrib\waveout\waveout.vcproj", "{4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}"
 EndProject
 Global
@@ -85,10 +80,6 @@ Global
 		{292974B0-C8B7-41EF-B603-554A2B25CB90}.Debug|Win32.Build.0 = Debug|Win32
 		{292974B0-C8B7-41EF-B603-554A2B25CB90}.Release|Win32.ActiveCfg = Release|Win32
 		{292974B0-C8B7-41EF-B603-554A2B25CB90}.Release|Win32.Build.0 = Release|Win32
-		{C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Debug|Win32.Build.0 = Debug|Win32
-		{C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Release|Win32.ActiveCfg = Release|Win32
-		{C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Release|Win32.Build.0 = Release|Win32
 		{4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Debug|Win32.Build.0 = Debug|Win32
 		{4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Release|Win32.ActiveCfg = Release|Win32

src/3rdparty/3rdparty.vcproj

@@ -102,8 +102,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="2"
-				FavorSizeOrSpeed="1"
+				InlineFunctionExpansion="0"
+				FavorSizeOrSpeed="0"
 				AdditionalIncludeDirectories="./include/;./include/sqlite/"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;SQLITE_THREADSAFE"
 				RuntimeLibrary="0"

src/core/LibraryFactory.cpp

@@ -34,8 +34,8 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 #include "pch.hpp"
-#include "LibraryFactory.h"
-#include "Library/LocalDB.h"
+#include <core/LibraryFactory.h>
+#include <Library/LocalDB.h>
 
 using namespace musik::core;
 

src/core/PlaybackQueue.cpp

@@ -31,8 +31,8 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 #include "pch.hpp"
-#include "core/PlaybackQueue.h"
-#include "core/LibraryFactory.h"
+#include <core/PlaybackQueue.h>
+#include <core/LibraryFactory.h>
 
 #include <boost/algorithm/string.hpp>
 

src/core/Preferences.cpp

@@ -35,7 +35,7 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include "pch.hpp"
-#include "Preferences.h"
+#include <core/Preferences.h>
 
 #include <core/Common.h>
 #include <core/db/CachedStatement.h>

src/core/audio/Transport.cpp

@@ -33,7 +33,7 @@
 
 #include "pch.hpp"
 
-#include "Transport.h"
+#include <core/audio/Transport.h>
 
 #include <core/PluginFactory.h>
 

src/core/core.vcproj

@@ -104,8 +104,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="2"
-				FavorSizeOrSpeed="1"
+				InlineFunctionExpansion="0"
+				FavorSizeOrSpeed="0"
 				AdditionalIncludeDirectories="./;../;../3rdparty/include/"
 				PreprocessorDefinitions="BOOST_ALL_NO_LIB;WIN32;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="0"

src/core/db/CachedStatement.cpp

@@ -37,9 +37,9 @@
 #pragma once
 
 #include "pch.hpp"
-#include "core/db/CachedStatement.h"
-#include "core/db/Statement.h"
-#include "core/db/Connection.h"
+#include <core/db/CachedStatement.h>
+#include <core/db/Statement.h>
+#include <core/db/Connection.h>
 
 using namespace musik::core::db;
 

src/core/db/CachedStatement.h

@@ -36,8 +36,8 @@
 
 #pragma once
 
-#include "core/config.h"
-#include "core/db/Statement.h"
+#include <core/config.h>
+#include <core/db/Statement.h>
 
 namespace musik{ namespace core{ namespace db{
     

src/core/db/Connection.cpp

@@ -35,7 +35,7 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include "pch.hpp"
-#include "core/db/Connection.h"
+#include <core/db/Connection.h>
 #include <boost/lexical_cast.hpp>
 
 using namespace musik::core::db;

src/core/db/Connection.h

@@ -36,10 +36,10 @@
 
 #pragma once
 
-#include "core/config.h"
-#include "core/db/dbconfig.h"
-#include "core/db/Statement.h"
-#include "core/db/ScopedTransaction.h"
+#include <core/config.h>
+#include <core/db/dbconfig.h>
+#include <core/db/Statement.h>
+#include <core/db/ScopedTransaction.h>
 
 #include <map>
 #include <boost/utility.hpp>

src/core/db/ScopedTransaction.cpp

@@ -35,8 +35,8 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include "pch.hpp"
-#include "core/db/ScopedTransaction.h"
-#include "core/db/Connection.h"
+#include <core/db/ScopedTransaction.h>
+#include <core/db/Connection.h>
 
 using namespace musik::core::db;
 

src/core/db/ScopedTransaction.h

@@ -36,7 +36,7 @@
 
 #pragma once
 
-#include "core/config.h"
+#include <core/config.h>
 #include <map>
 #include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>

src/core/db/Statement.cpp

@@ -37,8 +37,8 @@
 #pragma once
 
 #include "pch.hpp"
-#include "core/db/Statement.h"
-#include "core/db/Connection.h"
+#include <core/db/Statement.h>
+#include <core/db/Connection.h>
 
 using namespace musik::core::db;
 

src/core/db/Statement.h

@@ -36,7 +36,7 @@
 
 #pragma once
 
-#include "core/config.h"
+#include <core/config.h>
 #include <map>
 #include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
@@ -90,5 +90,5 @@ namespace musik{ namespace core{ namespace db{
 
 } } }
 
-#include "core/db/CachedStatement.h"
+#include <core/db/CachedStatement.h>
 

src/core/pch.hpp

@@ -41,9 +41,7 @@
 
 
 
-#include "config.h"
-
-#include <boost/asio.hpp>
+#include <core/config.h>
 
 #include <stdio.h>
 #include <cstdlib>
@@ -66,5 +64,5 @@
 #include <string>
 #include <sigslot/sigslot.h>
 
-#include "vld/vld.h"
+#include <vld/vld.h>
 

src/core/tracklist/IRandomAccess.h

@@ -36,7 +36,7 @@
 
 #pragma once
 
-#include "core/tracklist/IBase.h"
+#include <core/tracklist/IBase.h>
 #include <core/Library/Base.h>
 
 #include <boost/shared_ptr.hpp>

src/core/tracklist/Standard.cpp

@@ -35,7 +35,7 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include "pch.hpp"
-#include "core/tracklist/Standard.h"
+#include <core/tracklist/Standard.h>
 
 
 using namespace musik::core::tracklist;

src/cube/BrowseController.cpp

@@ -36,7 +36,7 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 
-#include <pch.hpp>
+#include "pch.hpp"
 #include <cube/BrowseController.hpp>
 #include <core/LibraryFactory.h>
 

src/cube/BrowseView.cpp

@@ -36,7 +36,7 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 
-#include <pch.hpp>
+#include "pch.hpp"
 #include <cube/BrowseView.hpp>
 
 //////////////////////////////////////////////////////////////////////////////

src/cube/MainMenuController.cpp

@@ -36,7 +36,7 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 
-#include <pch.hpp>
+#include "pch.hpp"
 #include <cube/MainMenuController.hpp>
 
 //////////////////////////////////////////////////////////////////////////////

src/cube/MainWindowController.cpp

@@ -36,7 +36,7 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 
-#include <pch.hpp>
+#include "pch.hpp"
 #include <cube/MainWindowController.hpp>
 #include <cube/TransportView.hpp>
 #include <cube/TracklistView.hpp>

src/cube/MetadataFilterController.cpp

@@ -36,7 +36,7 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 
-#include <pch.hpp>
+#include "pch.hpp"
 #include <cube/MetadataFilterController.hpp>
 #include <cube/MetadataFilterModel.hpp>
 #include <cube/BrowseController.hpp>

src/cube/MetadataFilterModel.cpp

@@ -40,7 +40,7 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
-#include <pch.hpp>
+#include "pch.hpp"
 
 #include <win32cpp/Utility.hpp>
 

src/cube/SettingsController.cpp

@@ -36,7 +36,7 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 
-#include <pch.hpp>
+#include "pch.hpp"
 #include <cube/SettingsController.hpp>
 #include <core/LibraryFactory.h>
 #include <core/Indexer.h>

src/cube/SettingsView.cpp

@@ -36,7 +36,7 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 
-#include <pch.hpp>
+#include "pch.hpp"
 #include <cube/SettingsView.hpp>
 
 //////////////////////////////////////////////////////////////////////////////

src/cube/SourcesCategory.cpp

@@ -40,7 +40,7 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
-#include <pch.hpp>
+#include "pch.hpp"
 #include <cube/SourcesCategory.hpp>
 
 using namespace musik::cube;

src/cube/SourcesCategory.hpp

@@ -40,7 +40,7 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
-#include <pch.hpp>
+#include "pch.hpp"
 
 #include <cube/SourcesItem.hpp>
 

src/cube/SourcesController.cpp

@@ -35,7 +35,7 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 
-#include <pch.hpp>
+#include "pch.hpp"
 #include <cube/SourcesListModel.hpp>
 #include <cube/SourcesController.hpp>
 

src/cube/SourcesItem.cpp

@@ -40,7 +40,7 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
-#include <pch.hpp>
+#include "pch.hpp"
 #include <cube/SourcesItem.hpp>
 
 using namespace musik::cube;

src/cube/SourcesItem.hpp

@@ -40,7 +40,7 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
-#include <pch.hpp>
+#include "pch.hpp"
 
 //////////////////////////////////////////////////////////////////////////////
 

src/cube/SourcesListModel.cpp

@@ -40,7 +40,7 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
-#include <pch.hpp>
+#include "pch.hpp"
 #include <cube/SourcesListModel.hpp>
 
 using namespace musik::cube;

src/cube/SourcesModel.cpp

@@ -40,7 +40,7 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
-#include <pch.hpp>
+#include "pch.hpp"
 #include <cube/SourcesModel.hpp>
 
 #include <core/PlaybackQueue.h>

src/cube/SourcesView.cpp

@@ -36,7 +36,7 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 
-#include <pch.hpp>
+#include "pch.hpp"
 #include <cube/SourcesView.hpp>
 #include <cube/BrowseView.hpp>
 

src/cube/TracklistController.cpp

@@ -36,7 +36,7 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 
-#include <pch.hpp>
+#include "pch.hpp"
 #include <cube/TracklistController.hpp>
 #include <cube/TracklistModel.hpp>
 #include <cube/TracklistColumn.hpp>

src/cube/TracklistInfoView.cpp

@@ -36,7 +36,7 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 
-#include <pch.hpp>
+#include "pch.hpp"
 #include <cube/TracklistInfoView.hpp>
 
 //////////////////////////////////////////////////////////////////////////////

src/cube/TracklistModel.cpp

@@ -40,7 +40,7 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
-#include <pch.hpp>
+#include "pch.hpp"
 
 #include <win32cpp/Utility.hpp>
 

src/cube/TracklistView.cpp

@@ -36,7 +36,7 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 
-#include <pch.hpp>
+#include "pch.hpp"
 #include <cube/TracklistView.hpp>
 
 //////////////////////////////////////////////////////////////////////////////

src/cube/TransportController.cpp

@@ -36,7 +36,7 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 
-#include <pch.hpp>
+#include "pch.hpp"
 
 #include <boost/format.hpp>
 

src/cube/TransportView.cpp

@@ -36,7 +36,7 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 
-#include <pch.hpp>
+#include "pch.hpp"
 #include <cube/TransportView.hpp>
 
 //////////////////////////////////////////////////////////////////////////////

src/cube/main.cpp

@@ -36,7 +36,7 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 
-#include <pch.hpp>
+#include "pch.hpp"
 #include <cube/MainWindowController.hpp>
 
 //////////////////////////////////////////////////////////////////////////////

src/cube/settings/SyncPathController.cpp

@@ -36,7 +36,7 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 
-#include <pch.hpp>
+#include "pch.hpp"
 #include <cube/settings/SyncPathController.hpp>
 #include <cube/settings/SyncPathModel.hpp>
 #include <cube/SettingsController.hpp>

src/cube/settings/SyncPathModel.cpp

@@ -36,7 +36,7 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 
-#include <pch.hpp>
+#include "pch.hpp"
 #include <win32cpp/ApplicationThread.hpp>
 #include <cube/settings/SyncPathModel.hpp>
 #include <core/Indexer.h>