From effaf1562f61c92fd0c62f10a55a6c5f2eeae217 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 14 Sep 2014 02:05:17 +0200
Subject: [PATCH] Move more to Makefile.common

---
 Makefile        | 18 ------------------
 Makefile.common | 26 ++++++++++++++++++++++++++
 Makefile.win    | 14 --------------
 3 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/Makefile b/Makefile
index 278b250ea6..f03a2cbb20 100644
--- a/Makefile
+++ b/Makefile
@@ -177,12 +177,6 @@ ifeq ($(HAVE_SDL2), 1)
    LIBS += $(SDL2_LIBS)
 endif
 
-ifeq ($(HAVE_D3D9), 1)
-   OBJ += gfx/d3d9/d3d.o gfx/d3d9/d3d_wrapper.o gfx/d3d9/render_chain.o gfx/fonts/d3d_font.o gfx/fonts/d3d_w32_font.o gfx/context/d3d_ctx.o
-   DEFINES += -DHAVE_WIN32_D3D9
-   LIBS += -ld3d9 -ld3dx9 -ldxguid
-endif
-
 ifeq ($(HAVE_DINPUT), 1)
    LIBS += -ldinput8 -ldxguid -lole32
    OBJ += input/dinput.o
@@ -288,18 +282,6 @@ ifeq ($(HAVE_WAYLAND), 1)
  LIBS += $(WAYLAND_LIBS)
 endif
 
-ifeq ($(HAVE_CG), 1)
-   OBJ += gfx/shader_cg.o
-   ifeq ($(OSX), 1)
-      LIBS += -framework Cg
-   else
-      LIBS += -lCg -lCgGL
-      ifeq ($(HAVE_D3D9),1)
-         LIBS += -lcgD3D9
-      endif
-   endif
-endif
-
 ifeq ($(HAVE_LIBXML2), 1)
    LIBS += $(LIBXML2_LIBS)
    DEFINES += $(LIBXML2_CFLAGS)
diff --git a/Makefile.common b/Makefile.common
index e0f577717d..b0081f86cf 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -125,3 +125,29 @@ ifeq ($(HAVE_XVIDEO), 1)
    DEFINES += $(XVIDEO_CFLAGS)
 endif
 
+ifeq ($(HAVE_CG), 1)
+	DEFINES += -DHAVE_CG
+   OBJ += gfx/shader_cg.o
+   ifeq ($(OSX), 1)
+      LIBS += -framework Cg
+   else
+      LIBS += -lCg -lCgGL
+      ifeq ($(HAVE_D3D9),1)
+         LIBS += -lcgD3D9
+      endif
+   endif
+endif
+
+ifeq ($(HAVE_D3D9), 1)
+   OBJ += gfx/d3d9/d3d.o \
+			 gfx/d3d9/render_chain.o \
+			 gfx/d3d9/d3d_wrapper.o \
+			 gfx/fonts/d3d_font.o \
+			 gfx/fonts/d3d_w32_font.o \
+			 gfx/context/d3d_ctx.o
+   DEFINES += -DHAVE_WIN32_D3D9
+   LIBS += -ld3d9 -ld3dx9 -ldxguid
+ifeq ($(HAVE_CG), 1)
+   LIBS += -lcg -lcgD3D9
+endif
+endif
diff --git a/Makefile.win b/Makefile.win
index 94bbec0e72..0c721aa8aa 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -114,20 +114,6 @@ ifeq ($(HAVE_OPENGL), 1)
    LIBS += -lopengl32 -lgdi32 -lcomdlg32
 endif
 
-ifeq ($(HAVE_CG), 1)
-   OBJ += gfx/shader_cg.o
-   LIBS += -lcg -lcgGL
-   DEFINES += -DHAVE_CG
-else
-   HAVE_D3D9 = 0
-endif
-
-ifeq ($(HAVE_D3D9), 1)
-   OBJ += gfx/d3d9/d3d.o gfx/d3d9/render_chain.o gfx/d3d9/d3d_wrapper.o gfx/fonts/d3d_font.o gfx/fonts/d3d_w32_font.o gfx/context/d3d_ctx.o
-   DEFINES += -DHAVE_WIN32_D3D9
-   LIBS += -ld3d9 -lcg -lcgD3D9 -ld3dx9 -ldxguid
-endif
-
 ifeq ($(HAVE_XAUDIO), 1)
    OBJ += audio/xaudio.o audio/xaudio-c/xaudio-c.o
    DEFINES += -DHAVE_XAUDIO