small fixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1623 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
a7c4697d22
commit
ac825114c8
|
@ -48,9 +48,10 @@ bool CWII_IPC_HLE_Device_fs::Open(u32 _CommandAddress, u32 _Mode)
|
|||
{
|
||||
// clear tmp folder
|
||||
{
|
||||
std::string WiiTempFolder = File::GetUserDirectory() + FULL_WII_USER_DIR + std::string("tmp");
|
||||
File::DeleteDirRecursively(WiiTempFolder.c_str());
|
||||
File::CreateDir(WiiTempFolder.c_str());
|
||||
// std::string WiiTempFolder = File::GetUserDirectory() + FULL_WII_USER_DIR + std::string("tmp");
|
||||
std::string WiiTempFolder = FULL_WII_USER_DIR + std::string("tmp");
|
||||
File::DeleteDirRecursively(WiiTempFolder.c_str());
|
||||
File::CreateDir(WiiTempFolder.c_str());
|
||||
}
|
||||
|
||||
// create home directory
|
||||
|
|
|
@ -107,8 +107,7 @@ SDLWindow::SDLWindow(int _iwidth, int _iheight) {
|
|||
|
||||
//init sdl video
|
||||
if (SDL_Init(SDL_INIT_VIDEO) < 0) {
|
||||
PanicAlert("Failed to init SDL");
|
||||
//TODO : Display an error message
|
||||
PanicAlert("Failed to init SDL: %s", SDL_GetError());
|
||||
SDL_Quit();
|
||||
// return NULL;
|
||||
}
|
||||
|
|
|
@ -57,7 +57,9 @@ X11Window::X11Window(int _iwidth, int _iheight) {
|
|||
GLX_GREEN_SIZE, 8,
|
||||
GLX_BLUE_SIZE, 8,
|
||||
GLX_DEPTH_SIZE, 24,
|
||||
GLX_SAMPLE_BUFFERS_ARB, g_Config.iMultisampleMode, GLX_SAMPLES_ARB, 1, None };
|
||||
GLX_SAMPLE_BUFFERS_ARB,
|
||||
g_Config.iMultisampleMode,
|
||||
GLX_SAMPLES_ARB, 1, None };
|
||||
dpy = XOpenDisplay(0);
|
||||
g_VideoInitialize.pWindowHandle = (HWND)dpy;
|
||||
screen = DefaultScreen(dpy);
|
||||
|
|
|
@ -42,6 +42,10 @@ CONTROLLER_STATE joystate[4];
|
|||
CONTROLLER_MAPPING joysticks[4];
|
||||
bool emulator_running = FALSE;
|
||||
|
||||
// TODO: fix this dirty hack to stop missing symbols
|
||||
void __Log(int log, const char *format, ...) {}
|
||||
void __Logv(int log, int v, const char *format, ...) {}
|
||||
|
||||
// Handle to window
|
||||
HWND m_hWnd;
|
||||
|
||||
|
|
Loading…
Reference in New Issue