diff options
author | notaz | 2012-12-10 23:41:06 +0200 |
---|---|---|
committer | notaz | 2012-12-10 23:41:06 +0200 |
commit | 3601e36bd526c63c842f68b2ff6cac82954e5e7e (patch) | |
tree | cc959168ba476f626440b60c4b93e1a5c83f3c4b /Makefile | |
parent | f29fbd5358e28135d389e2218da7c90f8b94b983 (diff) | |
parent | cc4f9b703ba166301a31ef6c695e1d02572e6bc4 (diff) | |
download | pcsx_rearmed-3601e36bd526c63c842f68b2ff6cac82954e5e7e.tar.gz pcsx_rearmed-3601e36bd526c63c842f68b2ff6cac82954e5e7e.tar.bz2 pcsx_rearmed-3601e36bd526c63c842f68b2ff6cac82954e5e7e.zip |
Merge branch 'libretro'
Conflicts:
frontend/libretro.c
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -120,7 +120,7 @@ OBJS += plugins/gpu_unai/gpulib_if.o ifeq "$(ARCH)" "arm" OBJS += plugins/gpu_unai/gpu_arm.o endif -plugins/gpu_unai/gpulib_if.o: CFLAGS += -DREARMED -O3 +plugins/gpu_unai/gpulib_if.o: CFLAGS += -DREARMED -O3 CC_LINK = $(CXX) endif @@ -163,6 +163,7 @@ USE_PLUGIN_LIB = 1 endif ifeq "$(PLATFORM)" "libretro" OBJS += frontend/libretro.o +CFLAGS += -DFRONTEND_SUPPORTS_RGB565 endif ifeq "$(USE_PLUGIN_LIB)" "1" |