revert stuff that probably wasn't intentionally committed. (n/w)

This commit is contained in:
Jonathan Gevaryahu 2013-12-29 03:57:41 +00:00
parent 0ff81df3e8
commit a36d348683
3 changed files with 3 additions and 4 deletions

1
.gitignore vendored
View File

@ -9,7 +9,6 @@
/nvram
/obj
/snap
src/osd/winui
src/regtests/chdman/temp
src/regtests/jedutil/output
/sta

View File

@ -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

View File

@ -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