Browse Source

build: fix a few build issues (missing -lxinput, missing d3d9 source files).

legacy
Sam Hocevar sam 12 years ago
parent
commit
ae79148e79
2 changed files with 5 additions and 2 deletions
  1. +4
    -1
      configure.ac
  2. +1
    -1
      src/Makefile.am

+ 4
- 1
configure.ac View File

@@ -117,7 +117,7 @@ dnl Are we on a Direct3D 9 platform?
ac_cv_my_have_d3d9="no" ac_cv_my_have_d3d9="no"
AC_CHECK_HEADERS(d3d9.h, [ac_cv_my_have_d3d9="yes"]) AC_CHECK_HEADERS(d3d9.h, [ac_cv_my_have_d3d9="yes"])
if test "${ac_cv_my_have_d3d9}" != "no"; then 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) AC_DEFINE(USE_D3D9, 1, Define to 1 to use DirectX 9)
fi fi
AM_CONDITIONAL(USE_D3D9, test "${ac_cv_my_have_d3d9}" != "no") AM_CONDITIONAL(USE_D3D9, test "${ac_cv_my_have_d3d9}" != "no")
@@ -391,6 +391,9 @@ AC_CONFIG_FILES(
AC_CONFIG_FILES( AC_CONFIG_FILES(
[orbital/Makefile [orbital/Makefile
]) ])
AC_CONFIG_FILES(
[neercs/Makefile
])


AC_OUTPUT AC_OUTPUT



+ 1
- 1
src/Makefile.am View File

@@ -67,7 +67,7 @@ sdl_sources = \
platform/sdl/sdlinput.cpp platform/sdl/sdlinput.h platform/sdl/sdlinput.cpp platform/sdl/sdlinput.h


d3d9_sources = \ d3d9_sources = \
platform/xbox/xboxinput.cpp platform/xbox/xboxinput.h
platform/d3d9/d3d9input.cpp platform/d3d9/d3d9input.h


if USE_NACL if USE_NACL
nacl_sources = \ nacl_sources = \


Loading…
Cancel
Save