ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
evilynux 2007-07-01 19:26:24 +00:00
parent 6ff8ce93e2
commit 76db3741f6
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
desmume/configure.ac
View File

@ -117,10 +117,16 @@ if test "x$HAVE_SDL" = "xyes"; then
fi fi
case $target in case $target in
*linux*)
LIBS="$LIBS -lGL"
;;
*mingw*) *mingw*)
LIBS="$LIBS -ldxguid -ldxerr8 -ldsound -lopengl32 -lws2_32 -mwindows" LIBS="$LIBS -ldxguid -ldxerr8 -ldsound -lopengl32 -lws2_32 -mwindows"
UI_DIR="windows" UI_DIR="windows"
;; ;;
*darwin*)
LIBS="$LIBS -framework OpenGL"
;;
esac esac
AC_SUBST(UI_DIR) AC_SUBST(UI_DIR)

1
desmume/src/cli/Makefile.am
View File

@ -1,7 +1,6 @@
include $(top_srcdir)/src/desmume.mk include $(top_srcdir)/src/desmume.mk
AM_CFLAGS += $(SDL_CFLAGS) AM_CFLAGS += $(SDL_CFLAGS)
AM_LDFLAGS += -lGL -lglut
bin_PROGRAMS = desmume-cli bin_PROGRAMS = desmume-cli
desmume_cli_SOURCES = main.c ../sndsdl.c ../ctrlssdl.h ../ctrlssdl.c desmume_cli_SOURCES = main.c ../sndsdl.c ../ctrlssdl.h ../ctrlssdl.c