From 7835f3580f14236b4e085fc44549a4d2ed146763 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sun, 1 Feb 2015 17:08:10 +0100 Subject: [PATCH 1/2] Renamed h files so they can be cross compiled on linux --- 3rdparty/dxsdk/Include/{D3D10.h => d3d10.h} | 0 3rdparty/dxsdk/Include/{D3D10_1.h => d3d10_1.h} | 0 3rdparty/dxsdk/Include/{D3D10_1shader.h => d3d10_1shader.h} | 0 3rdparty/dxsdk/Include/{D3D10effect.h => d3d10effect.h} | 0 3rdparty/dxsdk/Include/{D3D10shader.h => d3d10shader.h} | 0 3rdparty/dxsdk/Include/{D3D11.h => d3d11.h} | 0 3rdparty/dxsdk/Include/{D3D11SDKLayers.h => d3d11sdklayers.h} | 0 3rdparty/dxsdk/Include/{D3D11Shader.h => d3d11shader.h} | 0 3rdparty/dxsdk/Include/{D3Dcommon.h => d3dcommon.h} | 0 3rdparty/dxsdk/Include/{D3Dcompiler.h => d3dcompiler.h} | 0 3rdparty/dxsdk/Include/{D3DCSX.h => d3dcsx.h} | 0 3rdparty/dxsdk/Include/{D3DX10.h => d3dx10.h} | 0 3rdparty/dxsdk/Include/{D3DX10core.h => d3dx10core.h} | 0 3rdparty/dxsdk/Include/{D3DX10math.h => d3dx10math.h} | 0 3rdparty/dxsdk/Include/{D3DX10mesh.h => d3dx10mesh.h} | 0 3rdparty/dxsdk/Include/{D3DX10tex.h => d3dx10tex.h} | 0 3rdparty/dxsdk/Include/{D3DX11.h => d3dx11.h} | 0 3rdparty/dxsdk/Include/{D3DX11async.h => d3dx11async.h} | 0 3rdparty/dxsdk/Include/{D3DX11core.h => d3dx11core.h} | 0 3rdparty/dxsdk/Include/{D3DX11tex.h => d3dx11tex.h} | 0 20 files changed, 0 insertions(+), 0 deletions(-) rename 3rdparty/dxsdk/Include/{D3D10.h => d3d10.h} (100%) rename 3rdparty/dxsdk/Include/{D3D10_1.h => d3d10_1.h} (100%) rename 3rdparty/dxsdk/Include/{D3D10_1shader.h => d3d10_1shader.h} (100%) rename 3rdparty/dxsdk/Include/{D3D10effect.h => d3d10effect.h} (100%) rename 3rdparty/dxsdk/Include/{D3D10shader.h => d3d10shader.h} (100%) rename 3rdparty/dxsdk/Include/{D3D11.h => d3d11.h} (100%) rename 3rdparty/dxsdk/Include/{D3D11SDKLayers.h => d3d11sdklayers.h} (100%) rename 3rdparty/dxsdk/Include/{D3D11Shader.h => d3d11shader.h} (100%) rename 3rdparty/dxsdk/Include/{D3Dcommon.h => d3dcommon.h} (100%) rename 3rdparty/dxsdk/Include/{D3Dcompiler.h => d3dcompiler.h} (100%) rename 3rdparty/dxsdk/Include/{D3DCSX.h => d3dcsx.h} (100%) rename 3rdparty/dxsdk/Include/{D3DX10.h => d3dx10.h} (100%) rename 3rdparty/dxsdk/Include/{D3DX10core.h => d3dx10core.h} (100%) rename 3rdparty/dxsdk/Include/{D3DX10math.h => d3dx10math.h} (100%) rename 3rdparty/dxsdk/Include/{D3DX10mesh.h => d3dx10mesh.h} (100%) rename 3rdparty/dxsdk/Include/{D3DX10tex.h => d3dx10tex.h} (100%) rename 3rdparty/dxsdk/Include/{D3DX11.h => d3dx11.h} (100%) rename 3rdparty/dxsdk/Include/{D3DX11async.h => d3dx11async.h} (100%) rename 3rdparty/dxsdk/Include/{D3DX11core.h => d3dx11core.h} (100%) rename 3rdparty/dxsdk/Include/{D3DX11tex.h => d3dx11tex.h} (100%) diff --git a/3rdparty/dxsdk/Include/D3D10.h b/3rdparty/dxsdk/Include/d3d10.h similarity index 100% rename from 3rdparty/dxsdk/Include/D3D10.h rename to 3rdparty/dxsdk/Include/d3d10.h diff --git a/3rdparty/dxsdk/Include/D3D10_1.h b/3rdparty/dxsdk/Include/d3d10_1.h similarity index 100% rename from 3rdparty/dxsdk/Include/D3D10_1.h rename to 3rdparty/dxsdk/Include/d3d10_1.h diff --git a/3rdparty/dxsdk/Include/D3D10_1shader.h b/3rdparty/dxsdk/Include/d3d10_1shader.h similarity index 100% rename from 3rdparty/dxsdk/Include/D3D10_1shader.h rename to 3rdparty/dxsdk/Include/d3d10_1shader.h diff --git a/3rdparty/dxsdk/Include/D3D10effect.h b/3rdparty/dxsdk/Include/d3d10effect.h similarity index 100% rename from 3rdparty/dxsdk/Include/D3D10effect.h rename to 3rdparty/dxsdk/Include/d3d10effect.h diff --git a/3rdparty/dxsdk/Include/D3D10shader.h b/3rdparty/dxsdk/Include/d3d10shader.h similarity index 100% rename from 3rdparty/dxsdk/Include/D3D10shader.h rename to 3rdparty/dxsdk/Include/d3d10shader.h diff --git a/3rdparty/dxsdk/Include/D3D11.h b/3rdparty/dxsdk/Include/d3d11.h similarity index 100% rename from 3rdparty/dxsdk/Include/D3D11.h rename to 3rdparty/dxsdk/Include/d3d11.h diff --git a/3rdparty/dxsdk/Include/D3D11SDKLayers.h b/3rdparty/dxsdk/Include/d3d11sdklayers.h similarity index 100% rename from 3rdparty/dxsdk/Include/D3D11SDKLayers.h rename to 3rdparty/dxsdk/Include/d3d11sdklayers.h diff --git a/3rdparty/dxsdk/Include/D3D11Shader.h b/3rdparty/dxsdk/Include/d3d11shader.h similarity index 100% rename from 3rdparty/dxsdk/Include/D3D11Shader.h rename to 3rdparty/dxsdk/Include/d3d11shader.h diff --git a/3rdparty/dxsdk/Include/D3Dcommon.h b/3rdparty/dxsdk/Include/d3dcommon.h similarity index 100% rename from 3rdparty/dxsdk/Include/D3Dcommon.h rename to 3rdparty/dxsdk/Include/d3dcommon.h diff --git a/3rdparty/dxsdk/Include/D3Dcompiler.h b/3rdparty/dxsdk/Include/d3dcompiler.h similarity index 100% rename from 3rdparty/dxsdk/Include/D3Dcompiler.h rename to 3rdparty/dxsdk/Include/d3dcompiler.h diff --git a/3rdparty/dxsdk/Include/D3DCSX.h b/3rdparty/dxsdk/Include/d3dcsx.h similarity index 100% rename from 3rdparty/dxsdk/Include/D3DCSX.h rename to 3rdparty/dxsdk/Include/d3dcsx.h diff --git a/3rdparty/dxsdk/Include/D3DX10.h b/3rdparty/dxsdk/Include/d3dx10.h similarity index 100% rename from 3rdparty/dxsdk/Include/D3DX10.h rename to 3rdparty/dxsdk/Include/d3dx10.h diff --git a/3rdparty/dxsdk/Include/D3DX10core.h b/3rdparty/dxsdk/Include/d3dx10core.h similarity index 100% rename from 3rdparty/dxsdk/Include/D3DX10core.h rename to 3rdparty/dxsdk/Include/d3dx10core.h diff --git a/3rdparty/dxsdk/Include/D3DX10math.h b/3rdparty/dxsdk/Include/d3dx10math.h similarity index 100% rename from 3rdparty/dxsdk/Include/D3DX10math.h rename to 3rdparty/dxsdk/Include/d3dx10math.h diff --git a/3rdparty/dxsdk/Include/D3DX10mesh.h b/3rdparty/dxsdk/Include/d3dx10mesh.h similarity index 100% rename from 3rdparty/dxsdk/Include/D3DX10mesh.h rename to 3rdparty/dxsdk/Include/d3dx10mesh.h diff --git a/3rdparty/dxsdk/Include/D3DX10tex.h b/3rdparty/dxsdk/Include/d3dx10tex.h similarity index 100% rename from 3rdparty/dxsdk/Include/D3DX10tex.h rename to 3rdparty/dxsdk/Include/d3dx10tex.h diff --git a/3rdparty/dxsdk/Include/D3DX11.h b/3rdparty/dxsdk/Include/d3dx11.h similarity index 100% rename from 3rdparty/dxsdk/Include/D3DX11.h rename to 3rdparty/dxsdk/Include/d3dx11.h diff --git a/3rdparty/dxsdk/Include/D3DX11async.h b/3rdparty/dxsdk/Include/d3dx11async.h similarity index 100% rename from 3rdparty/dxsdk/Include/D3DX11async.h rename to 3rdparty/dxsdk/Include/d3dx11async.h diff --git a/3rdparty/dxsdk/Include/D3DX11core.h b/3rdparty/dxsdk/Include/d3dx11core.h similarity index 100% rename from 3rdparty/dxsdk/Include/D3DX11core.h rename to 3rdparty/dxsdk/Include/d3dx11core.h diff --git a/3rdparty/dxsdk/Include/D3DX11tex.h b/3rdparty/dxsdk/Include/d3dx11tex.h similarity index 100% rename from 3rdparty/dxsdk/Include/D3DX11tex.h rename to 3rdparty/dxsdk/Include/d3dx11tex.h From 5806f40f572c38effa17b87553d9614413e2fa97 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sun, 1 Feb 2015 18:02:56 +0100 Subject: [PATCH 2/2] fix bgfx compile on linux, still disable till confirmed (nw) --- src/osd/sdl/sdl.mak | 1 + 1 file changed, 1 insertion(+) diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak index a765bb8a5ae..8bfc0597610 100644 --- a/src/osd/sdl/sdl.mak +++ b/src/osd/sdl/sdl.mak @@ -787,6 +787,7 @@ ifdef USE_BGFX DEFS += -DUSE_BGFX OSDOBJS += $(SDLOBJ)/drawbgfx.o INCPATH += -I$(3RDPARTY)/bgfx/include -I$(3RDPARTY)/bx/include +LIBS += $(LIBGL) endif #-------------------------------------------------