Matthew Parlane 934e150596 Merge branch 'master' into wii-network ...

Conflicts:
	Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
	Source/Core/Core/Src/ConfigManager.cpp
	Source/Core/Core/Src/HLE/HLE_OS.h
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h

2013-04-24 00:48:00 +12:00

..

Bochs_disasm

Remove scons-related files

2012-03-25 12:55:02 -07:00

CLRun

Update CLRun to have OCL 1.2

2013-02-23 01:47:37 -05:00

gettext

Build mo translation files on all platforms. Had to import msgfmt executable in the Externals to do this on windows.

2011-01-10 19:26:36 +00:00

GLew

update to glew1.9, win binaries also from official release

2013-02-04 21:11:12 +01:00

libjpeg

update libjpeg to 8c

2011-02-05 04:47:16 +00:00

libpng

Update libpng to 1.2.50 so it can be built with Clang 3.2

2013-04-18 22:11:07 -05:00

libusb

Hopefully fix win32 build issues.

2012-12-31 03:51:34 +13:00

LZO

Remove scons-related files

2012-03-25 12:55:02 -07:00

OpenAL

Added a Dolby Pro Logic II (DPL2) decoder in the OpenAL backend. DPL2 audio is decoded to 5.1. Code adapted from ffdshow.

2013-01-11 14:03:09 +11:00

openssl

openssl: fix linker warning by adding those pesky pdb files.

2012-02-27 00:54:11 -08:00

portaudio

oops, forgot to disable WDMKS on portaudio 32bit build

2012-03-19 03:40:21 -07:00

SDL

Remove scons-related files

2012-03-25 12:55:02 -07:00

SFML

Remove scons-related files

2012-03-25 12:55:02 -07:00

SOIL

Warning free SOIL lib.

2012-12-23 19:24:57 +13:00

soundtouch

Fixed the Windows 32bit debug build.

2013-03-14 22:18:13 +11:00

wxWidgets3

This change might work better if I git add the files

2013-03-29 07:31:15 -07:00

zlib

Remove scons-related files

2012-03-25 12:55:02 -07:00