diff --git a/src/WinLibs/FTGL/win32_vcpp/ftgl_static_lib/Release_ST/BuildLog.htm b/src/WinLibs/FTGL/win32_vcpp/ftgl_static_lib/Release_ST/BuildLog.htm index 96c269b3d..eef55e376 100644 Binary files a/src/WinLibs/FTGL/win32_vcpp/ftgl_static_lib/Release_ST/BuildLog.htm and b/src/WinLibs/FTGL/win32_vcpp/ftgl_static_lib/Release_ST/BuildLog.htm differ diff --git a/src/WinLibs/freetype-2.3.5/objs/release/BuildLog.htm b/src/WinLibs/freetype-2.3.5/objs/release/BuildLog.htm index f0e008849..60933eb38 100644 Binary files a/src/WinLibs/freetype-2.3.5/objs/release/BuildLog.htm and b/src/WinLibs/freetype-2.3.5/objs/release/BuildLog.htm differ diff --git a/src/projectM-engine/PBuffer.cpp b/src/projectM-engine/FBO.cpp similarity index 99% rename from src/projectM-engine/PBuffer.cpp rename to src/projectM-engine/FBO.cpp index 316facd93..278bf47c7 100755 --- a/src/projectM-engine/PBuffer.cpp +++ b/src/projectM-engine/FBO.cpp @@ -19,7 +19,7 @@ * */ /** - * $Id: pbuffer.c,v 1.1.1.1 2005/12/23 18:05:00 psperl Exp $ + * $Id: FBO.c,v 1.1.1.1 2005/12/23 18:05:00 psperl Exp $ * * Render this methods */ @@ -28,7 +28,7 @@ //#include #include "Common.hpp" -#include "PBuffer.hpp" +#include "FBO.hpp" #ifdef MACOS #include diff --git a/src/projectM-engine/PBuffer.hpp b/src/projectM-engine/FBO.hpp similarity index 93% rename from src/projectM-engine/PBuffer.hpp rename to src/projectM-engine/FBO.hpp index 9ee9fed5a..3ee2e2354 100755 --- a/src/projectM-engine/PBuffer.hpp +++ b/src/projectM-engine/FBO.hpp @@ -19,7 +19,7 @@ * */ /** - * $Id: PBuffer.hpp,v 1.1.1.1 2005/12/23 18:05:00 psperl Exp $ + * $Id: FBO.hpp,v 1.1.1.1 2005/12/23 18:05:00 psperl Exp $ * * Opaque render target * @@ -28,11 +28,11 @@ #ifndef _RENDERTARGET_H #define _RENDERTARGET_H -#ifdef USE_FBO -#include -#endif -#if defined(MACOS) && !defined(USE_FBO) +#include + + +#if defined(MACOS) #include #endif /** MACOS */ diff --git a/src/projectM-engine/Renderer.hpp b/src/projectM-engine/Renderer.hpp index 13f7451da..fb9d550ca 100644 --- a/src/projectM-engine/Renderer.hpp +++ b/src/projectM-engine/Renderer.hpp @@ -1,7 +1,7 @@ #ifndef Renderer_HPP #define Renderer_HPP -#include "PBuffer.hpp" +#include "FBO.hpp" #include "PresetFrameIO.hpp" #include "BeatDetect.hpp" #include diff --git a/src/projectM-engine/libprojectM.vcproj b/src/projectM-engine/libprojectM.vcproj index 2fa8d0e34..eedf284ce 100644 --- a/src/projectM-engine/libprojectM.vcproj +++ b/src/projectM-engine/libprojectM.vcproj @@ -218,6 +218,10 @@ RelativePath=".\Expr.cpp" > + + @@ -262,10 +266,6 @@ RelativePath=".\Parser.cpp" > - - @@ -399,6 +399,10 @@ RelativePath=".\fatal.h" > + + @@ -451,10 +455,6 @@ RelativePath=".\Parser.hpp" > - - diff --git a/src/projectM-engine/projectM.hpp b/src/projectM-engine/projectM.hpp index a5d77a2b1..507aa7e37 100755 --- a/src/projectM-engine/projectM.hpp +++ b/src/projectM-engine/projectM.hpp @@ -29,7 +29,7 @@ #ifndef _PROJECTM_H #define _PROJECTM_H -#include "PBuffer.hpp" +#include "FBO.hpp" #ifdef WIN32 #include "win32-dirent.h" diff --git a/src/projectM-wmp/projectM-wmp.suo b/src/projectM-wmp/projectM-wmp.suo index ba47e9076..d333e06a8 100644 Binary files a/src/projectM-wmp/projectM-wmp.suo and b/src/projectM-wmp/projectM-wmp.suo differ diff --git a/src/projectM-wmp/projectM-wmp/Release/BuildLog.htm b/src/projectM-wmp/projectM-wmp/Release/BuildLog.htm index b22342123..8f439eaa9 100644 Binary files a/src/projectM-wmp/projectM-wmp/Release/BuildLog.htm and b/src/projectM-wmp/projectM-wmp/Release/BuildLog.htm differ diff --git a/src/projectM-wmp/projectM-wmp/projectM-wmp_i.c b/src/projectM-wmp/projectM-wmp/projectM-wmp_i.c index c1031b74e..3df30f729 100644 --- a/src/projectM-wmp/projectM-wmp/projectM-wmp_i.c +++ b/src/projectM-wmp/projectM-wmp/projectM-wmp_i.c @@ -6,7 +6,7 @@ /* File created by MIDL compiler version 7.00.0499 */ -/* at Mon Oct 01 11:59:33 2007 +/* at Mon Oct 01 15:17:08 2007 */ /* Compiler settings for .\projectM-wmp.idl: Oicf, W1, Zp8, env=Win32 (32b run)