Matthew Parlane e0c9a1fd09 Merge branch 'master' into wii-network ...

Conflicts:
	Source/Core/Common/Src/CommonPaths.h
	Source/Core/Core/CMakeLists.txt
	Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp

2013-01-01 23:28:46 +13:00

..

Bochs_disasm

Remove scons-related files

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

Cg

Revert r7078.

2011-06-13 11:17:36 +00:00

Cg64

Revert r7078.

2011-06-13 11:17:36 +00:00

CLRun

Remove scons-related files

2012-03-25 12:55:02 -07: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

Remove scons-related files

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

libjpeg

update libjpeg to 8c

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

libpng

Remove scons-related files

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

LZO

Remove scons-related files

2012-03-25 12:55:02 -07: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

wxWidgets3

Fix OS X 10.6 compatibility.

2012-12-07 19:49:08 +01:00

zlib

Remove scons-related files

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