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

lilypad: fix windows build 

I think lilypad used libc instead of libc++
This commit is contained in:
Gregory Hainaut 2015-02-20 23:04:27 +01:00
parent 642371996a
commit 8d76586dec
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/LilyPad/InputManager.cpp
View File

@ -223,7 +223,11 @@ void Device::CalcVirtualState() {
double East = sin(angle); double East = sin(angle);
double South = -cos(angle); double South = -cos(angle);
// Normalize so greatest direction is 1. // Normalize so greatest direction is 1.
#ifdef __linux__
double mul = FULLY_DOWN / std::max(fabs(South), fabs(East)); double mul = FULLY_DOWN / std::max(fabs(South), fabs(East));
#else
double mul = FULLY_DOWN / max(fabs(South), fabs(East));
#endif
iEast = (int) floor(East * mul + 0.5); iEast = (int) floor(East * mul + 0.5);
iSouth = (int) floor(South * mul + 0.5); iSouth = (int) floor(South * mul + 0.5);
} }

4
plugins/LilyPad/LilyPad.cpp
View File

@ -421,7 +421,11 @@ void ProcessButtonBinding(Binding *b, ButtonSum *sum, int value) {
void CapSum(ButtonSum *sum) { void CapSum(ButtonSum *sum) {
int i; int i;
for (i=0; i<3; i++) { for (i=0; i<3; i++) {
#ifdef __linux__
int div = std::max(abs(sum->sticks[i].horiz), abs(sum->sticks[i].vert)); int div = std::max(abs(sum->sticks[i].horiz), abs(sum->sticks[i].vert));
#else
int div = max(abs(sum->sticks[i].horiz), abs(sum->sticks[i].vert));
#endif
if (div > 255) { if (div > 255) {
sum->sticks[i].horiz = sum->sticks[i].horiz * 255 / div; sum->sticks[i].horiz = sum->sticks[i].horiz * 255 / div;
sum->sticks[i].vert = sum->sticks[i].vert * 255 / div; sum->sticks[i].vert = sum->sticks[i].vert * 255 / div;