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

More cleanup...

This commit is contained in:
Themaister 2010-12-30 03:02:30 +01:00
parent 9006c77fcf
commit 38616ee794
7 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -26,7 +26,7 @@ ifeq ($(HAVE_AL), 1)
LIBS += -lopenal LIBS += -lopenal
endif endif
ifeq ($(HAVE_OPENGL), 1) ifeq ($(HAVE_GLFW), 1)
OBJ += gfx/gl.o OBJ += gfx/gl.o
LIBS += -lglfw LIBS += -lglfw
endif endif

3
driver.c
View File

@ -21,6 +21,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "hqflt/filters.h" #include "hqflt/filters.h"
#include "config.h"
static const audio_driver_t *audio_drivers[] = { static const audio_driver_t *audio_drivers[] = {
#ifdef HAVE_ALSA #ifdef HAVE_ALSA
@ -41,7 +42,7 @@ static const audio_driver_t *audio_drivers[] = {
}; };
static const video_driver_t *video_drivers[] = { static const video_driver_t *video_drivers[] = {
#ifdef HAVE_GL #ifdef HAVE_GLFW
&video_gl, &video_gl,
#endif #endif
}; };

2
hqflt/filters.h
View File

@ -19,6 +19,8 @@
#ifndef __FILTERS_H #ifndef __FILTERS_H
#define __FILTERS_H #define __FILTERS_H
#include "config.h"
#ifdef HAVE_FILTER #ifdef HAVE_FILTER
#include "pastlib.h" #include "pastlib.h"

4
qb/config.libs.sh
View File

@ -16,10 +16,12 @@ check_lib ROAR -lroar roar_vs_new
check_lib GLFW -lglfw glfwInit check_lib GLFW -lglfw glfwInit
check_critical GLFW "Cannot find GLFW library." check_critical GLFW "Cannot find GLFW library."
check_lib CG -lCg cgCreateContext
check_lib SRC -lsamplerate src_callback_new check_lib SRC -lsamplerate src_callback_new
# Creates config.mk. # Creates config.mk.
VARS="ALSA OSS AL RSOUND ROAR GLFW FILTERS" VARS="ALSA OSS AL RSOUND ROAR GLFW FILTER CG"
create_config_make config.mk $VARS create_config_make config.mk $VARS
create_config_header config.h $VARS create_config_header config.h $VARS

2
qb/config.params.sh
View File

@ -8,7 +8,7 @@ PACKAGE_VERSION=0.1
# $2: Comment # $2: Comment
# $3: Default arg. auto implies that HAVE_ALSA will be set according to library checks later on. # $3: Default arg. auto implies that HAVE_ALSA will be set according to library checks later on.
add_command_line_string LIBSNES "libsnes library used" "-lsnes" add_command_line_string LIBSNES "libsnes library used" "-lsnes"
add_command_line_enable FILTERS "Disable CPU filter support" yes add_command_line_enable FILTER "Disable CPU filter support" yes
add_command_line_enable CG "Enable CG shader support" auto add_command_line_enable CG "Enable CG shader support" auto
add_command_line_enable ALSA "Enable ALSA support" auto add_command_line_enable ALSA "Enable ALSA support" auto
add_command_line_enable OSS "Enable OSS support" auto add_command_line_enable OSS "Enable OSS support" auto

4
qb/qb.libs.sh
View File

@ -277,9 +277,9 @@ create_config_make()
do do
tmpval="HAVE_$1" tmpval="HAVE_$1"
eval tmpval=\$$tmpval eval tmpval=\$$tmpval
if [ $tmpval = yes ]; then if [ "$tmpval" = yes ]; then
echo "HAVE_$1 = 1" >> "$outfile" echo "HAVE_$1 = 1" >> "$outfile"
elif [ $tmpval = no ]; then elif [ "$tmpval" = no ]; then
echo "HAVE_$1 = 0" >> "$outfile" echo "HAVE_$1 = 0" >> "$outfile"
fi fi

1
settings.c
View File

@ -21,6 +21,7 @@
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "hqflt/filters.h" #include "hqflt/filters.h"
#include "config.h"
struct settings g_settings; struct settings g_settings;