This should fix compilation on MacOSX.
- OpenGL flags moved to configure.ac as this is target specific. - Removed -lglut as it's not used, we're using glu but not glut. - Using "-framework OpenGL" for target darwin.
This commit is contained in:
parent
6ff8ce93e2
commit
76db3741f6
|
@ -117,10 +117,16 @@ if test "x$HAVE_SDL" = "xyes"; then
|
|||
fi
|
||||
|
||||
case $target in
|
||||
*linux*)
|
||||
LIBS="$LIBS -lGL"
|
||||
;;
|
||||
*mingw*)
|
||||
LIBS="$LIBS -ldxguid -ldxerr8 -ldsound -lopengl32 -lws2_32 -mwindows"
|
||||
UI_DIR="windows"
|
||||
;;
|
||||
*darwin*)
|
||||
LIBS="$LIBS -framework OpenGL"
|
||||
;;
|
||||
esac
|
||||
|
||||
AC_SUBST(UI_DIR)
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
include $(top_srcdir)/src/desmume.mk
|
||||
|
||||
AM_CFLAGS += $(SDL_CFLAGS)
|
||||
AM_LDFLAGS += -lGL -lglut
|
||||
|
||||
bin_PROGRAMS = desmume-cli
|
||||
desmume_cli_SOURCES = main.c ../sndsdl.c ../ctrlssdl.h ../ctrlssdl.c
|
||||
|
|
Loading…
Reference in New Issue