From ae79148e7986c43c11f3b43d8e7318ab0d99d2b9 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Fri, 8 Jun 2012 19:54:41 +0000 Subject: [PATCH] build: fix a few build issues (missing -lxinput, missing d3d9 source files). --- configure.ac | 5 ++++- src/Makefile.am | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 16ca2210..759d7e98 100644 --- a/configure.ac +++ b/configure.ac @@ -117,7 +117,7 @@ dnl Are we on a Direct3D 9 platform? ac_cv_my_have_d3d9="no" AC_CHECK_HEADERS(d3d9.h, [ac_cv_my_have_d3d9="yes"]) if test "${ac_cv_my_have_d3d9}" != "no"; then - D3D_LIBS="${D3D_LIBS} -ld3d9 -ld3dx9" + D3D_LIBS="${D3D_LIBS} -ld3d9 -ld3dx9 -lxinput" AC_DEFINE(USE_D3D9, 1, Define to 1 to use DirectX 9) fi AM_CONDITIONAL(USE_D3D9, test "${ac_cv_my_have_d3d9}" != "no") @@ -391,6 +391,9 @@ AC_CONFIG_FILES( AC_CONFIG_FILES( [orbital/Makefile ]) +AC_CONFIG_FILES( + [neercs/Makefile +]) AC_OUTPUT diff --git a/src/Makefile.am b/src/Makefile.am index a50612ff..0c7fa1e6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -67,7 +67,7 @@ sdl_sources = \ platform/sdl/sdlinput.cpp platform/sdl/sdlinput.h d3d9_sources = \ - platform/xbox/xboxinput.cpp platform/xbox/xboxinput.h + platform/d3d9/d3d9input.cpp platform/d3d9/d3d9input.h if USE_NACL nacl_sources = \