ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build fix for the NoGUI build. 

Also removed a few compiler warning while I was at it.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5387 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-04-19 03:06:18 +00:00
parent 7bc2887f34
commit d93cebf84b
5 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/Src/MainNoGUI.cpp
View File

@ -130,6 +130,8 @@ void Host_Message(int Id)
#endif #endif
} }
void Host_UpdateTitle(const char* title){};
void Host_UpdateLogDisplay(){} void Host_UpdateLogDisplay(){}

10
Source/Plugins/InputPluginCommon/Src/SConscript
View File

@ -4,12 +4,18 @@ Import('env')
files = [ files = [
'Config.cpp', 'Config.cpp',
'ConfigDiagBitmaps.cpp',
'ConfigDiag.cpp',
'ControllerEmu.cpp', 'ControllerEmu.cpp',
'IniFile.cpp', 'IniFile.cpp',
] ]
if env['HAVE_WX']:
files += [
'ConfigDiagBitmaps.cpp',
'ConfigDiag.cpp',
]
env_inputpc = env.Clone() env_inputpc = env.Clone()
env_inputpc.Append(CXXFLAGS = [ '-fPIC' ]) env_inputpc.Append(CXXFLAGS = [ '-fPIC' ])
env_inputpc.StaticLibrary(env['local_libs'] + "inputplugincommon", files) env_inputpc.StaticLibrary(env['local_libs'] + "inputplugincommon", files)

2
Source/Plugins/Plugin_GCPadNew/Src/GCPadNew.cpp
View File

@ -8,7 +8,7 @@
#if defined(HAVE_WX) && HAVE_WX #if defined(HAVE_WX) && HAVE_WX
#include "ConfigDiag.h" #include "ConfigDiag.h"
#endif #endif
#include "Config.h" #include "../../InputPluginCommon/Src/Config.h"
#if defined(HAVE_X11) && HAVE_X11 #if defined(HAVE_X11) && HAVE_X11
#include <X11/Xlib.h> #include <X11/Xlib.h>

15
Source/Plugins/Plugin_VideoOGL/Src/TextureMngr.cpp
View File

@ -16,6 +16,7 @@
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include <vector> #include <vector>
#include <cmath>
#include "Globals.h" #include "Globals.h"
#include "CommonPaths.h" #include "CommonPaths.h"
@ -268,9 +269,9 @@ TextureMngr::TCacheEntry* TextureMngr::Load(int texstage, u32 address, int width
int expandedWidth = (width + bsw) & (~bsw); int expandedWidth = (width + bsw) & (~bsw);
int expandedHeight = (height + bsh) & (~bsh); int expandedHeight = (height + bsh) & (~bsh);
u64 hash_value; u64 hash_value = 0;
u32 texID = address; u32 texID = address;
u64 texHash; u64 texHash = 0;
u32 FullFormat = tex_format; u32 FullFormat = tex_format;
if ((tex_format == GX_TF_C4) || (tex_format == GX_TF_C8) || (tex_format == GX_TF_C14X2)) if ((tex_format == GX_TF_C4) || (tex_format == GX_TF_C8) || (tex_format == GX_TF_C14X2))
FullFormat = (tex_format | (tlutfmt << 16)); FullFormat = (tex_format | (tlutfmt << 16));
@ -396,9 +397,9 @@ TextureMngr::TCacheEntry* TextureMngr::Load(int texstage, u32 address, int width
TexLevels = (isPow2 && UseNativeMips && tex_format != GX_TF_CMPR) ? (int)(log((double)TexLevels)/log((double)2)) + 1 : (isPow2?0:1); TexLevels = (isPow2 && UseNativeMips && tex_format != GX_TF_CMPR) ? (int)(log((double)TexLevels)/log((double)2)) + 1 : (isPow2?0:1);
if(TexLevels > maxlevel && maxlevel > 0) if(TexLevels > maxlevel && maxlevel > 0)
TexLevels = maxlevel; TexLevels = maxlevel;
int gl_format; int gl_format = 0;
int gl_iformat; int gl_iformat = 0;
int gl_type; int gl_type = 0;
entry.bHaveMipMaps = UseNativeMips; entry.bHaveMipMaps = UseNativeMips;
if (dfmt != PC_TEX_FMT_DXT1) if (dfmt != PC_TEX_FMT_DXT1)
{ {
@ -503,10 +504,10 @@ TextureMngr::TCacheEntry* TextureMngr::Load(int texstage, u32 address, int width
//this is not a problem as the level are filtered by lod min and max value //this is not a problem as the level are filtered by lod min and max value
if (dfmt != PC_TEX_FMT_DXT1) if (dfmt != PC_TEX_FMT_DXT1)
{ {
if (expandedWidth != currentWidth) if (expandedWidth != (int)currentWidth)
glPixelStorei(GL_UNPACK_ROW_LENGTH, expandedWidth); glPixelStorei(GL_UNPACK_ROW_LENGTH, expandedWidth);
glTexImage2D(target, level, gl_iformat, currentWidth, currentHeight, 0, gl_format, gl_type, temp); glTexImage2D(target, level, gl_iformat, currentWidth, currentHeight, 0, gl_format, gl_type, temp);
if (expandedWidth != currentWidth) // reset if (expandedWidth != (int)currentWidth) // reset
glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
} }
else else

2
Source/Plugins/Plugin_WiimoteNew/Src/WiimoteNew.cpp
View File

@ -8,7 +8,7 @@
#if defined(HAVE_WX) && HAVE_WX #if defined(HAVE_WX) && HAVE_WX
#include "ConfigDiag.h" #include "ConfigDiag.h"
#endif #endif
#include "Config.h" #include "../../InputPluginCommon/Src/Config.h"
#if defined(HAVE_X11) && HAVE_X11 #if defined(HAVE_X11) && HAVE_X11
#include <X11/Xlib.h> #include <X11/Xlib.h>