piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wii-usb' into temp merge branch

Browse Source 
Conflicts:
	Source/Core/Common/Src/Log.h
	Source/Core/Core/Core.vcxproj
	Source/Core/Core/Core.vcxproj.filters
	Source/VSProps/Dolphin.Win32.props
	Source/VSProps/Dolphin.x64.props
This commit is contained in:
Matthew Parlane
2013-01-11 23:07:12 +13:00
parent 9af785532e 08cc460e96
commit 9754fda516
15 changed files with 2329 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Common/Src/Log.h
View File

@ -65,6 +65,7 @@ enum LOG_TYPE {
WII_IPC_DVD,
WII_IPC_ES,
WII_IPC_FILEIO,
WII_IPC_HID,
WII_IPC_HLE,
WII_IPC_NET,
WII_IPC_WC24,
@ -100,10 +101,10 @@ void GenericLog(LOGTYPES_LEVELS level, LOGTYPES_TYPE type,
;
#if defined LOGGING || defined _DEBUG || defined DEBUGFAST
#define MAX_LOGLEVEL DEBUG_LEVEL
#define MAX_LOGLEVEL WARNING_LEVEL
#else
#ifndef MAX_LOGLEVEL
#define MAX_LOGLEVEL DEBUG_LEVEL
#define MAX_LOGLEVEL DEBUG_LEVEL
#endif // loglevel
#endif // logging