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

Fixes issue 2958 / 2960 

Removed wiiuse linkage to common.lib and removed inclusion of log.h(r5944) under windows, since it's obviously causing problems.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5963 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
snzgoo 2010-07-24 14:20:50 +00:00
parent d906dcee27
commit 840334ad97
6 changed files with 41 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Externals/WiiUse/Src/definitions.h vendored
View File

@ -34,6 +34,7 @@
#ifndef DEFINITIONS_H_INCLUDED #ifndef DEFINITIONS_H_INCLUDED
#define DEFINITIONS_H_INCLUDED #define DEFINITIONS_H_INCLUDED
#ifndef WIN32
#include "Log.h" #include "Log.h"
// NOTICE_LEVEL is more appropriate for the uses of WIIUSE_INFO than INFO_LEVEL // NOTICE_LEVEL is more appropriate for the uses of WIIUSE_INFO than INFO_LEVEL
@ -42,6 +43,32 @@
#define WIIUSE_ERROR(...) { GENERIC_LOG(WIIMOTE, ERROR_LEVEL, __VA_ARGS__) } #define WIIUSE_ERROR(...) { GENERIC_LOG(WIIMOTE, ERROR_LEVEL, __VA_ARGS__) }
#define WIIUSE_WARNING(...) { GENERIC_LOG(WIIMOTE, WARNING_LEVEL, __VA_ARGS__) } #define WIIUSE_WARNING(...) { GENERIC_LOG(WIIMOTE, WARNING_LEVEL, __VA_ARGS__) }
#define WIIUSE_DEBUG(...) { GENERIC_LOG(WIIMOTE, DEBUG_LEVEL, __VA_ARGS__) } #define WIIUSE_DEBUG(...) { GENERIC_LOG(WIIMOTE, DEBUG_LEVEL, __VA_ARGS__) }
#else
/* disable warnings I don't care about */
#pragma warning(disable:4244) /* possible loss of data conversion */
#pragma warning(disable:4273) /* inconsistent dll linkage */
#pragma warning(disable:4217)
#define WIIUSE_ERROR(fmt, ...) fprintf(stderr, "[ERROR] " fmt "\n", ##__VA_ARGS__)
#define WIIUSE_WARNING(fmt, ...) fprintf(stderr, "[WARNING] " fmt "\n", ##__VA_ARGS__)
#define WIIUSE_INFO(fmt, ...) fprintf(stderr, "[INFO] " fmt "\n", ##__VA_ARGS__)
#ifdef WITH_WIIUSE_DEBUG
#define WIIUSE_DEBUG(fmt, ...) do { \
char* file = __FILE__; \
int i = strlen(file) - 1; \
for (; i && (file[i] != '\\'); --i); \
fprintf(stderr, "[DEBUG] %s:%i: " fmt "\n", file+i+1, __LINE__, ##__VA_ARGS__); \
} while (0)
#else
#define WIIUSE_DEBUG(fmt, ...)
#endif
#endif
/* Convert to big endian */ /* Convert to big endian */
#define BIG_ENDIAN_LONG(i) (htonl(i)) #define BIG_ENDIAN_LONG(i) (htonl(i))

BIN
Externals/WiiUse/Win32/wiiuse.dll vendored
View File

Binary file not shown.

BIN
Externals/WiiUse/Win32/wiiuse.lib vendored
View File

Binary file not shown.

BIN
Externals/WiiUse/X64/wiiuse.dll vendored
View File

Binary file not shown.

BIN
Externals/WiiUse/X64/wiiuse.lib vendored
View File

Binary file not shown.

28
Externals/WiiUse/wiiuse.vcproj vendored
View File

@ -53,7 +53,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" Optimization="2"
InlineFunctionExpansion="2" InlineFunctionExpansion="2"
AdditionalIncludeDirectories="C:\WinDDK\7600.16385.0\inc\api;C:\WinDDK\7600.16385.0\inc\crt;..\..\Source\Core\Common\Src;" AdditionalIncludeDirectories="C:\WinDDK\7600.16385.0\inc\api;C:\WinDDK\7600.16385.0\inc\crt;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WIIUSE_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WIIUSE_EXPORTS"
IgnoreStandardIncludePath="true" IgnoreStandardIncludePath="true"
StringPooling="true" StringPooling="true"
@ -79,11 +79,11 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib hid.lib setupapi.lib Common.lib WINMM.LIB" AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib hid.lib setupapi.lib"
OutputFile="..\WiiUse\$(PlatformName)\wiiuse.dll" OutputFile="..\WiiUse\$(PlatformName)\wiiuse.dll"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories="C:\WinDDK\7600.16385.0\lib\Win7\i386;..\..\Source\Core\Common\$(PlatformName)\$(ConfigurationName)" AdditionalLibraryDirectories="C:\WinDDK\7600.16385.0\lib\Win7\i386;"
IgnoreAllDefaultLibraries="false" IgnoreAllDefaultLibraries="false"
ProgramDatabaseFile=".\win32\Release/wiiuse.pdb" ProgramDatabaseFile=".\win32\Release/wiiuse.pdb"
RandomizedBaseAddress="1" RandomizedBaseAddress="1"
@ -150,7 +150,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" Optimization="2"
InlineFunctionExpansion="2" InlineFunctionExpansion="2"
AdditionalIncludeDirectories="C:\WinDDK\7600.16385.0\inc\api;C:\WinDDK\7600.16385.0\inc\crt;..\..\Source\Core\Common\Src;" AdditionalIncludeDirectories="C:\WinDDK\7600.16385.0\inc\api;C:\WinDDK\7600.16385.0\inc\crt;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WIIUSE_EXPORTS;_WIN64" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WIIUSE_EXPORTS;_WIN64"
IgnoreStandardIncludePath="true" IgnoreStandardIncludePath="true"
StringPooling="true" StringPooling="true"
@ -176,11 +176,11 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib hid.lib setupapi.lib Common.lib" AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib hid.lib setupapi.lib"
OutputFile="..\WiiUse\$(PlatformName)\wiiuse.dll" OutputFile="..\WiiUse\$(PlatformName)\wiiuse.dll"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories="C:\WinDDK\7600.16385.0\lib\win7\amd64;..\..\Source\Core\Common\$(PlatformName)\$(ConfigurationName)" AdditionalLibraryDirectories="C:\WinDDK\7600.16385.0\lib\win7\amd64;"
ProgramDatabaseFile=".\x64\Release/wiiuse.pdb" ProgramDatabaseFile=".\x64\Release/wiiuse.pdb"
RandomizedBaseAddress="1" RandomizedBaseAddress="1"
DataExecutionPrevention="0" DataExecutionPrevention="0"
@ -245,7 +245,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="C:\WinDDK\7600.16385.0\inc\api;C:\WinDDK\7600.16385.0\inc\crt;..\..\Source\Core\Common\Src;" AdditionalIncludeDirectories="C:\WinDDK\7600.16385.0\inc\api;C:\WinDDK\7600.16385.0\inc\crt;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WIIUSE_EXPORTS;WITH_WIIUSE_DEBUG" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WIIUSE_EXPORTS;WITH_WIIUSE_DEBUG"
IgnoreStandardIncludePath="true" IgnoreStandardIncludePath="true"
MinimalRebuild="true" MinimalRebuild="true"
@ -272,13 +272,13 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib hid.lib setupapi.lib Common.lib WINMM.LIB" AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib hid.lib setupapi.lib"
OutputFile="..\WiiUse\$(PlatformName)\wiiused.dll" OutputFile="..\WiiUse\$(PlatformName)\wiiused.dll"
LinkIncremental="2" LinkIncremental="2"
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories="C:\WinDDK\7600.16385.0\lib\Win7\i386;..\..\Source\Core\Common\$(PlatformName)\$(ConfigurationName)" AdditionalLibraryDirectories="C:\WinDDK\7600.16385.0\lib\Win7\i386;"
IgnoreAllDefaultLibraries="false" IgnoreAllDefaultLibraries="false"
IgnoreDefaultLibraryNames="LIBCMTD.lib" IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile=".\win32\Debug/wiiuse.pdb" ProgramDatabaseFile=".\win32\Debug/wiiuse.pdb"
RandomizedBaseAddress="1" RandomizedBaseAddress="1"
@ -344,7 +344,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="C:\WinDDK\7600.16385.0\inc\api;C:\WinDDK\7600.16385.0\inc\crt;..\..\Source\Core\Common\Src;" AdditionalIncludeDirectories="C:\WinDDK\7600.16385.0\inc\api;C:\WinDDK\7600.16385.0\inc\crt;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WIIUSE_EXPORTS;WITH_WIIUSE_DEBUG" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WIIUSE_EXPORTS;WITH_WIIUSE_DEBUG"
IgnoreStandardIncludePath="true" IgnoreStandardIncludePath="true"
MinimalRebuild="true" MinimalRebuild="true"
@ -371,12 +371,12 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib hid.lib setupapi.lib Common.lib" AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib hid.lib setupapi.lib"
OutputFile="..\WiiUse\$(PlatformName)\wiiused.dll" OutputFile="..\WiiUse\$(PlatformName)\wiiused.dll"
LinkIncremental="2" LinkIncremental="2"
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories="C:\WinDDK\7600.16385.0\lib\win7\amd64;..\..\Source\Core\Common\$(PlatformName)\$(ConfigurationName)" AdditionalLibraryDirectories="C:\WinDDK\7600.16385.0\lib\win7\amd64;"
IgnoreDefaultLibraryNames="LIBCMTD.lib" IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile=".\x64\Debug/wiiuse.pdb" ProgramDatabaseFile=".\x64\Debug/wiiuse.pdb"
RandomizedBaseAddress="1" RandomizedBaseAddress="1"