remove the dependence of the boost.

ezhong0812 · Apr 21, 2012 · 03d30fc · 03d30fc
1 parent 7c77afe
commit 03d30fc
Show file tree

Hide file tree

Showing 14 changed files with 280 additions and 255 deletions.
diff --git a/audio/audio.vcproj b/audio/audio.vcproj
@@ -40,6 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="..\libav\ffmpeg\include;..\libav\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;AUDIO_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -116,6 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\libav\ffmpeg\include;..\libav\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;AUDIO_EXPORTS"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"

diff --git a/audio/ins.h b/audio/ins.h
@@ -12,62 +12,14 @@
 # pragma once
 #endif
 
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <assert.h>
-
-#include <set>
-#include <map>
-#include <list>
-#include <algorithm>
-
-#include <boost/any.hpp>
-#include <boost/thread.hpp>
-#include <boost/bind.hpp>
-#include <boost/pool/singleton_pool.hpp>
-
-#define BOOST_FILESYSTEM_VERSION 2
-#include <boost/filesystem.hpp>
-
-
-using namespace boost;
-
-// extern "C"
-// {
-// #include "stdint.h"
-// #include "libavutil/avutil.h"
-// #include "libavutil/avstring.h"
-// #include "libavutil/pixdesc.h"
-// #include "libavutil/imgutils.h"
-// #include "libavutil/parseutils.h"
-// #include "libavutil/samplefmt.h"
-// #include "libavformat/avformat.h"
-// #include "libswscale/swscale.h"
-// #include "libavutil/mathematics.h"
-// 
-// #include "libavfilter/avfilter.h"
-// #include "libavfilter/avfiltergraph.h"
-// #include "libavcodec/avcodec.h"
-// #include "libavcodec/opt.h"
-// #include "libavcodec/avfft.h"
-// #include "libavcodec/audioconvert.h"
-// 
-// #include "libpng15/png.h"
-// }
-
+#include <stdint.h>
 #include <windows.h>
-#include <gl\gl.h>
-#include <gl\glu.h>
-
-#include <ddraw.h>
-#include <d3d9.h>
 
 #include <MMSystem.h>
 #include <dsound.h>
 
-// #include "logger.h"
-// extern libavplayer::logger logs;
-
 #endif // __INS_H__
diff --git a/avcore/avcore.vcproj b/avcore/avcore.vcproj
@@ -183,6 +183,13 @@
 			<File
 				RelativePath=".\avplayer.cpp"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\player_impl.cpp"
@@ -217,6 +224,13 @@
 			<File
 				RelativePath=".\avplayer.h"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\player_impl.h"