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

Fix build - some files moved around.

This commit is contained in:
Alcaro 2014-11-25 20:40:38 +01:00
parent 5e732377a3
commit 049b876ae7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libretro-test-gl/Makefile
View File

@ -95,7 +95,7 @@ else
CFLAGS += -std=gnu99 CFLAGS += -std=gnu99
endif endif
OBJECTS := libretro-test.o ../gfx/glsym/rglgen.o OBJECTS := libretro-test.o ../libretro-sdk/glsym/rglgen.o
CFLAGS += -Wall -pedantic $(fpic) CFLAGS += -Wall -pedantic $(fpic)
ifeq ($(GLES), 1) ifeq ($(GLES), 1)
@ -106,9 +106,9 @@ ifeq ($(GLES), 1)
CFLAGS += -DHAVE_OPENGLES3 -DGLES3 CFLAGS += -DHAVE_OPENGLES3 -DGLES3
endif endif
LIBS += -lGLESv2 # Still link against GLESv2 when using GLES3 API, at least on desktop Linux. LIBS += -lGLESv2 # Still link against GLESv2 when using GLES3 API, at least on desktop Linux.
OBJECTS += ../gfx/glsym/glsym_es2.o OBJECTS += ../libretro-sdk/glsym/glsym_es2.o
else else
OBJECTS += ../gfx/glsym/glsym_gl.o OBJECTS += ../libretro-sdk/glsym/glsym_gl.o
LIBS += $(GL_LIB) LIBS += $(GL_LIB)
endif endif
@ -122,7 +122,7 @@ $(TARGET): $(OBJECTS)
$(CC) $(fpic) $(SHARED) $(INCLUDES) -o $@ $(OBJECTS) $(LIBS) -lm $(EXTRA_GL_LIBS) $(CC) $(fpic) $(SHARED) $(INCLUDES) -o $@ $(OBJECTS) $(LIBS) -lm $(EXTRA_GL_LIBS)
%.o: %.c %.o: %.c
$(CC) $(CFLAGS) -c -o $@ $< $(CC) -I../libretro-sdk/include $(CFLAGS) -c -o $@ $<
clean: clean:
rm -f $(OBJECTS) $(TARGET) rm -f $(OBJECTS) $(TARGET)

2
libretro-test-gl/libretro-test.c
View File

@ -8,7 +8,7 @@
#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
static struct retro_hw_render_callback hw_render; static struct retro_hw_render_callback hw_render;
#include "../gfx/glsym/glsym.h" #include "../libretro-sdk/include/glsym/glsym.h"
#define BASE_WIDTH 320 #define BASE_WIDTH 320
#define BASE_HEIGHT 240 #define BASE_HEIGHT 240