mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-13 10:55:45 +00:00
Code Issues Projects Releases Wiki Activity

windows updates

Browse Source 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@495 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
psperl
2007-10-01 18:12:51 +00:00
parent 421f424b20
commit 94521a6548
4 changed files with 54 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/projectM-engine/Renderer.hpp
View File

@ -16,9 +16,15 @@
#endif
#ifdef USE_FTGL
#ifdef WIN32
#include <FTGL.h>
#include <FTGLPixmapFont.h>
#include <FTGLPolygonFont.h>
#else
#include <FTGL/FTGL.h>
#include <FTGL/FTGLPixmapFont.h>
#include <FTGL/FTGLPolygonFont.h>
#endif
#endif /** USE_FTGL */
class BeatDetect;

18
src/projectM-engine/TextureManager.cpp
View File

@ -11,9 +11,7 @@ TextureManager::TextureManager(const std::string _presetURL): presetURL(_presetU
}
TextureManager::~TextureManager()
{
// DeleteAllTextures();
{
std::map<std::string, GLuint>::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;
}

72
src/projectM-engine/libprojectM.vcproj
View File

@ -42,11 +42,11 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&quot;C:\Documents and Settings\DEV2\My Documents\svn\src\glew\include\GL&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;DEBUG;GLEW_STATIC;USE_FBO"
AdditionalIncludeDirectories="&quot;C:\Documents and Settings\DEV2\My Documents\svn\freetype-2.3.5\include&quot;;&quot;C:\Documents and Settings\DEV2\My Documents\svn\FTGL\include&quot;;&quot;C:\Documents and Settings\DEV2\My Documents\svn\src\glew\include\GL&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;DEBUG;GLEW_STATIC;USE_FBO;USE_FTGL"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeLibrary="3"
PrecompiledHeaderFile=".\Debug/libprojectM.pch"
AssemblerListingLocation=".\Debug/"
ObjectFile=".\Debug/"
@ -119,10 +119,10 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="&quot;C:\Documents and Settings\DEV2\My Documents\svn\src\glew\include\GL&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GLEW_STATIC;USE_FBO"
AdditionalIncludeDirectories="&quot;..\WinLibs\freetype-2.3.5\include&quot;;&quot;..\WinLibs\FTGL\include&quot;;&quot;..\WinLibs\glew\include\GL&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GLEW_STATIC;USE_FBO; USE_FTGL"
StringPooling="true"
RuntimeLibrary="0"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\Release/libprojectM.pch"
AssemblerListingLocation=".\Release/"
@ -172,6 +172,14 @@
</Configuration>
</Configurations>
<References>
<ProjectReference
ReferencedProjectIdentifier="{94AC71AA-7528-4E56-A5A9-EDDFE6D20A39}"
RelativePathToProject="..\WinLibs\glew\build\vc6\glew_static.vcproj"
/>
<ProjectReference
ReferencedProjectIdentifier="{4A80DC08-8D4E-4136-B818-AF0024000A21}"
RelativePathToProject="..\WinLibs\FTGL\win32_vcpp\ftgl_static_lib\ftgl_static_lib.vcproj"
/>
</References>
<Files>
<Filter
@ -182,10 +190,6 @@
RelativePath=".\BeatDetect.cpp"
>
</File>
<File
RelativePath=".\bmpLoader.c"
>
</File>
<File
RelativePath=".\BuiltinFuncs.cpp"
>
@ -226,6 +230,14 @@
RelativePath=".\IdlePreset.cpp"
>
</File>
<File
RelativePath=".\image_DXT.c"
>
</File>
<File
RelativePath=".\image_helper.c"
>
</File>
<File
RelativePath=".\InitCond.cpp"
>
@ -258,10 +270,6 @@
RelativePath=".\PCM.cpp"
>
</File>
<File
RelativePath=".\pcxLoader.c"
>
</File>
<File
RelativePath=".\PerFrameEqn.cpp"
>
@ -303,17 +311,17 @@
>
</File>
<File
RelativePath=".\texture.cpp"
RelativePath=".\SOIL.c"
>
</File>
<File
RelativePath=".\stb_image.c"
>
</File>
<File
RelativePath=".\TextureManager.cpp"
>
</File>
<File
RelativePath=".\tgaLoader.c"
>
</File>
<File
RelativePath=".\timer.cpp"
>
@ -339,10 +347,6 @@
RelativePath=".\BeatDetect.hpp"
>
</File>
<File
RelativePath=".\bmpLoader.h"
>
</File>
<File
RelativePath=".\BuiltinFuncs.hpp"
>
@ -407,6 +411,14 @@
RelativePath=".\IdlePreset.hpp"
>
</File>
<File
RelativePath=".\image_DXT.h"
>
</File>
<File
RelativePath=".\image_helper.h"
>
</File>
<File
RelativePath=".\InitCond.hpp"
>
@ -447,10 +459,6 @@
RelativePath=".\PCM.hpp"
>
</File>
<File
RelativePath=".\pcxLoader.h"
>
</File>
<File
RelativePath=".\PerFrameEqn.hpp"
>
@ -496,17 +504,17 @@
>
</File>
<File
RelativePath=".\texture.h"
RelativePath=".\SOIL.h"
>
</File>
<File
RelativePath=".\stb_image.h"
>
</File>
<File
RelativePath=".\TextureManager.hpp"
>
</File>
<File
RelativePath=".\tgaLoader.h"
>
</File>
<File
RelativePath=".\timer.h"
>

BIN
src/projectM-wmp/projectM-wmp.suo
View File

Binary file not shown.