diff options
| author | twinaphex | 2012-12-24 09:24:51 +0100 |
|---|---|---|
| committer | twinaphex | 2012-12-24 09:24:51 +0100 |
| commit | a9a3be15b649c633521b5a0143715d4ae901b790 (patch) | |
| tree | dc8d67ad83f1c299bd67a233dedcac33945d66c1 /Makefile | |
| parent | 3ef6b3599b083286ba72673dec7e7032e5e8e013 (diff) | |
| parent | 00a212aade3025ba76e60d90520a7b302f83b7ff (diff) | |
| download | pcsx_rearmed-a9a3be15b649c633521b5a0143715d4ae901b790.tar.gz pcsx_rearmed-a9a3be15b649c633521b5a0143715d4ae901b790.tar.bz2 pcsx_rearmed-a9a3be15b649c633521b5a0143715d4ae901b790.zip | |
Merge git://github.com/notaz/pcsx_rearmed
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -132,9 +132,19 @@ OBJS += plugins/dfinput/main.o plugins/dfinput/pad.o plugins/dfinput/guncon.o # frontend/gui ifeq "$(PLATFORM)" "generic" -OBJS += frontend/libpicofe/in_sdl.o frontend/plat_sdl.o +OBJS += frontend/libpicofe/in_sdl.o +OBJS += frontend/libpicofe/plat_sdl.o OBJS += frontend/libpicofe/plat_dummy.o OBJS += frontend/libpicofe/linux/in_evdev.o +OBJS += frontend/plat_sdl.o +ifeq "$(HAVE_GLES)" "1" +OBJS += frontend/libpicofe/gl.o frontend/libpicofe/gl_platform.o +LDLIBS += $(LDLIBS_GLES) +frontend/libpicofe/plat_sdl.o: CFLAGS += -DHAVE_GLES $(CFLAGS_GLES) +frontend/libpicofe/gl_platform.o: CFLAGS += -DHAVE_GLES $(CFLAGS_GLES) +frontend/libpicofe/gl.o: CFLAGS += -DHAVE_GLES $(CFLAGS_GLES) +frontend/plat_sdl.o: CFLAGS += -DHAVE_GLES $(CFLAGS_GLES) +endif USE_PLUGIN_LIB = 1 USE_FRONTEND = 1 endif |