Merge branch 'master' into miami

# Conflicts:
#	premake5.lua
#	sdk/rwsdk/include/d3d8/baaplylt.c
#	sdk/rwsdk/include/d3d8/rpstereo.h
#	sdk/rwsdk/include/d3d8/rpstereo.rpe
#	sdk/rwsdk/include/d3d8/rtintel.h
#	sdk/rwsdk/include/d3d8/rtintel.rpe
#	src/audio/oal/stream.cpp

29 files changed, 0 insertions, 0 deletions

diff --git a/sdk/dx8sdk/Lib/DxErr8.lib b/sdk/dx8sdk/Lib/DxErr8.lib
new file mode 100644
index 00000000..c22ccde6
--- /dev/null
+++ b/sdk/dx8sdk/Lib/DxErr8.lib
diff --git a/sdk/dx8sdk/Lib/DxErr9.lib b/sdk/dx8sdk/Lib/DxErr9.lib
new file mode 100644
index 00000000..3f039fa2
--- /dev/null
+++ b/sdk/dx8sdk/Lib/DxErr9.lib
diff --git a/sdk/dx8sdk/Lib/amstrmid.lib b/sdk/dx8sdk/Lib/amstrmid.lib
new file mode 100644
index 00000000..8d921239
--- /dev/null
+++ b/sdk/dx8sdk/Lib/amstrmid.lib
diff --git a/sdk/dx8sdk/Lib/d3d8.lib b/sdk/dx8sdk/Lib/d3d8.lib
new file mode 100644
index 00000000..828ed30d
--- /dev/null
+++ b/sdk/dx8sdk/Lib/d3d8.lib
diff --git a/sdk/dx8sdk/Lib/d3d9.lib b/sdk/dx8sdk/Lib/d3d9.lib
new file mode 100644
index 00000000..9e08d863
--- /dev/null
+++ b/sdk/dx8sdk/Lib/d3d9.lib
diff --git a/sdk/dx8sdk/Lib/d3dx.lib b/sdk/dx8sdk/Lib/d3dx.lib
new file mode 100644
index 00000000..e9450b1b
--- /dev/null
+++ b/sdk/dx8sdk/Lib/d3dx.lib
diff --git a/sdk/dx8sdk/Lib/d3dx8.lib b/sdk/dx8sdk/Lib/d3dx8.lib
new file mode 100644
index 00000000..8305ff4c
--- /dev/null
+++ b/sdk/dx8sdk/Lib/d3dx8.lib
diff --git a/sdk/dx8sdk/Lib/d3dx8d.lib b/sdk/dx8sdk/Lib/d3dx8d.lib
new file mode 100644
index 00000000..70ac0e3a
--- /dev/null
+++ b/sdk/dx8sdk/Lib/d3dx8d.lib
diff --git a/sdk/dx8sdk/Lib/d3dx8dt.lib b/sdk/dx8sdk/Lib/d3dx8dt.lib
new file mode 100644
index 00000000..755e2901
--- /dev/null
+++ b/sdk/dx8sdk/Lib/d3dx8dt.lib
diff --git a/sdk/dx8sdk/Lib/d3dx9.lib b/sdk/dx8sdk/Lib/d3dx9.lib
new file mode 100644
index 00000000..ffc9f0d8
--- /dev/null
+++ b/sdk/dx8sdk/Lib/d3dx9.lib
diff --git a/sdk/dx8sdk/Lib/d3dx9d.lib b/sdk/dx8sdk/Lib/d3dx9d.lib
new file mode 100644
index 00000000..feacd895
--- /dev/null
+++ b/sdk/dx8sdk/Lib/d3dx9d.lib
diff --git a/sdk/dx8sdk/Lib/d3dx9dt.lib b/sdk/dx8sdk/Lib/d3dx9dt.lib
new file mode 100644
index 00000000..8d6d32a9
--- /dev/null
+++ b/sdk/dx8sdk/Lib/d3dx9dt.lib
diff --git a/sdk/dx8sdk/Lib/d3dxd.lib b/sdk/dx8sdk/Lib/d3dxd.lib
new file mode 100644
index 00000000..bf370d3c
--- /dev/null
+++ b/sdk/dx8sdk/Lib/d3dxd.lib
diff --git a/sdk/dx8sdk/Lib/d3dxof.lib b/sdk/dx8sdk/Lib/d3dxof.lib
new file mode 100644
index 00000000..c7e51781
--- /dev/null
+++ b/sdk/dx8sdk/Lib/d3dxof.lib
diff --git a/sdk/dx8sdk/Lib/ddraw.lib b/sdk/dx8sdk/Lib/ddraw.lib
new file mode 100644
index 00000000..d7d0583e
--- /dev/null
+++ b/sdk/dx8sdk/Lib/ddraw.lib
diff --git a/sdk/dx8sdk/Lib/dinput.lib b/sdk/dx8sdk/Lib/dinput.lib
new file mode 100644
index 00000000..3abb4540
--- /dev/null
+++ b/sdk/dx8sdk/Lib/dinput.lib
diff --git a/sdk/dx8sdk/Lib/dinput8.lib b/sdk/dx8sdk/Lib/dinput8.lib
new file mode 100644
index 00000000..3fad62fb
--- /dev/null
+++ b/sdk/dx8sdk/Lib/dinput8.lib
diff --git a/sdk/dx8sdk/Lib/dmoguids.lib b/sdk/dx8sdk/Lib/dmoguids.lib
new file mode 100644
index 00000000..ad5fbfb2
--- /dev/null
+++ b/sdk/dx8sdk/Lib/dmoguids.lib
diff --git a/sdk/dx8sdk/Lib/dplayx.lib b/sdk/dx8sdk/Lib/dplayx.lib
new file mode 100644
index 00000000..d8e42998
--- /dev/null
+++ b/sdk/dx8sdk/Lib/dplayx.lib
diff --git a/sdk/dx8sdk/Lib/dsetup.lib b/sdk/dx8sdk/Lib/dsetup.lib
new file mode 100644
index 00000000..8acfa3ea
--- /dev/null
+++ b/sdk/dx8sdk/Lib/dsetup.lib
diff --git a/sdk/dx8sdk/Lib/dsound.lib b/sdk/dx8sdk/Lib/dsound.lib
new file mode 100644
index 00000000..6e9604d3
--- /dev/null
+++ b/sdk/dx8sdk/Lib/dsound.lib
diff --git a/sdk/dx8sdk/Lib/dxguid.lib b/sdk/dx8sdk/Lib/dxguid.lib
new file mode 100644
index 00000000..f251a925
--- /dev/null
+++ b/sdk/dx8sdk/Lib/dxguid.lib
diff --git a/sdk/dx8sdk/Lib/dxtrans.lib b/sdk/dx8sdk/Lib/dxtrans.lib
new file mode 100644
index 00000000..20a49952
--- /dev/null
+++ b/sdk/dx8sdk/Lib/dxtrans.lib
diff --git a/sdk/dx8sdk/Lib/encapi.lib b/sdk/dx8sdk/Lib/encapi.lib
new file mode 100644
index 00000000..0e3d774d
--- /dev/null
+++ b/sdk/dx8sdk/Lib/encapi.lib
diff --git a/sdk/dx8sdk/Lib/ksproxy.lib b/sdk/dx8sdk/Lib/ksproxy.lib
new file mode 100644
index 00000000..4f362460
--- /dev/null
+++ b/sdk/dx8sdk/Lib/ksproxy.lib
diff --git a/sdk/dx8sdk/Lib/ksuser.lib b/sdk/dx8sdk/Lib/ksuser.lib
new file mode 100644
index 00000000..7aba7bd7
--- /dev/null
+++ b/sdk/dx8sdk/Lib/ksuser.lib
diff --git a/sdk/dx8sdk/Lib/msdmo.lib b/sdk/dx8sdk/Lib/msdmo.lib
new file mode 100644
index 00000000..290e308f
--- /dev/null
+++ b/sdk/dx8sdk/Lib/msdmo.lib
diff --git a/sdk/dx8sdk/Lib/quartz.lib b/sdk/dx8sdk/Lib/quartz.lib
new file mode 100644
index 00000000..47fcd1d2
--- /dev/null
+++ b/sdk/dx8sdk/Lib/quartz.lib
diff --git a/sdk/dx8sdk/Lib/strmiids.lib b/sdk/dx8sdk/Lib/strmiids.lib
new file mode 100644
index 00000000..8d921239
--- /dev/null
+++ b/sdk/dx8sdk/Lib/strmiids.lib