From a36d3486832e518a5e136c20f680be331ff45a63 Mon Sep 17 00:00:00 2001
From: Jonathan Gevaryahu <Lord-Nightmare@users.noreply.github.com>
Date: Sun, 29 Dec 2013 03:57:41 +0000
Subject: [PATCH] revert stuff that probably wasn't intentionally committed.
 (n/w)

---
 .gitignore                  | 1 -
 src/osd/sdl/sdl.mak         | 2 +-
 src/osd/windows/windows.mak | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 85fa96e539a..16370bc6232 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,6 @@
 /nvram
 /obj
 /snap
-src/osd/winui
 src/regtests/chdman/temp
 src/regtests/jedutil/output
 /sta
diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak
index b57243751df..2bd34cb1bc9 100644
--- a/src/osd/sdl/sdl.mak
+++ b/src/osd/sdl/sdl.mak
@@ -66,7 +66,7 @@ USE_DISPATCH_GL = 1
 
 # uncomment the next line to specify where you have installed
 # SDL. Equivalent to the ./configure --prefix=<path>
-SDL_INSTALL_ROOT = /usr/local/sdl20
+# SDL_INSTALL_ROOT = /usr/local/sdl13
 
 # uncomment to disable the Qt debugger (on non-OSX this disables all debugging)
 # NO_USE_QTDEBUG = 1
diff --git a/src/osd/windows/windows.mak b/src/osd/windows/windows.mak
index 3517e8c7e70..4c9455a8f9f 100644
--- a/src/osd/windows/windows.mak
+++ b/src/osd/windows/windows.mak
@@ -290,10 +290,10 @@ LIBS += -luser32 -lgdi32 -ldsound -ldxguid -lwinmm -ladvapi32 -lcomctl32 -lshlwa
 
 ifeq ($(DIRECTINPUT),8)
 LIBS += -ldinput8
-CCOMFLAGS += -DDIRECTINPUT_VERSION=0x0800 -Idirectx
+CCOMFLAGS += -DDIRECTINPUT_VERSION=0x0800
 else
 LIBS += -ldinput
-CCOMFLAGS += -DDIRECTINPUT_VERSION=0x0700 -Idirectx
+CCOMFLAGS += -DDIRECTINPUT_VERSION=0x0700
 endif
 
 LIBS += -lcomdlg32