diff --git a/src/projectM-engine/Renderer.hpp b/src/projectM-engine/Renderer.hpp index 0fa0485ec..13f7451da 100644 --- a/src/projectM-engine/Renderer.hpp +++ b/src/projectM-engine/Renderer.hpp @@ -16,9 +16,15 @@ #endif #ifdef USE_FTGL +#ifdef WIN32 +#include +#include +#include +#else #include #include #include +#endif #endif /** USE_FTGL */ class BeatDetect; diff --git a/src/projectM-engine/TextureManager.cpp b/src/projectM-engine/TextureManager.cpp index 9a670c7fb..dc5ef68f3 100644 --- a/src/projectM-engine/TextureManager.cpp +++ b/src/projectM-engine/TextureManager.cpp @@ -11,9 +11,7 @@ TextureManager::TextureManager(const std::string _presetURL): presetURL(_presetU } TextureManager::~TextureManager() -{ - // DeleteAllTextures(); - +{ std::map::const_iterator iter; for(iter = textures.begin(); iter != textures.end(); iter++) @@ -62,21 +60,21 @@ GLuint TextureManager::getTexture(const std::string imageURL) fullURL.c_str(), SOIL_LOAD_AUTO, SOIL_CREATE_NEW_ID, - SOIL_FLAG_POWER_OF_TWO - //| SOIL_FLAG_MIPMAPS - | SOIL_FLAG_MULTIPLY_ALPHA - | SOIL_FLAG_COMPRESS_TO_DXT + + // SOIL_FLAG_POWER_OF_TWO + // SOIL_FLAG_MIPMAPS + // SOIL_FLAG_MULTIPLY_ALPHA + SOIL_FLAG_COMPRESS_TO_DXT //| SOIL_FLAG_DDS_LOAD_DIRECT ); textures[imageURL]=tex; return tex; - } - // return LoadTexture(fullUrl.c_str(),false); + } } unsigned int TextureManager::getTextureMemorySize() { - return 0;//GetTotalTextureSize(); + return 0; } diff --git a/src/projectM-engine/libprojectM.vcproj b/src/projectM-engine/libprojectM.vcproj index f72fc3870..2fa8d0e34 100644 --- a/src/projectM-engine/libprojectM.vcproj +++ b/src/projectM-engine/libprojectM.vcproj @@ -42,11 +42,11 @@ + + - - @@ -226,6 +230,14 @@ RelativePath=".\IdlePreset.cpp" > + + + + @@ -258,10 +270,6 @@ RelativePath=".\PCM.cpp" > - - @@ -303,17 +311,17 @@ > + + - - @@ -339,10 +347,6 @@ RelativePath=".\BeatDetect.hpp" > - - @@ -407,6 +411,14 @@ RelativePath=".\IdlePreset.hpp" > + + + + @@ -447,10 +459,6 @@ RelativePath=".\PCM.hpp" > - - @@ -496,17 +504,17 @@ > + + - - diff --git a/src/projectM-wmp/projectM-wmp.suo b/src/projectM-wmp/projectM-wmp.suo index a8f8085c0..ba47e9076 100644 Binary files a/src/projectM-wmp/projectM-wmp.suo and b/src/projectM-wmp/projectM-wmp.suo differ