mirror of
https://github.com/blawar/GLideN64.git
synced 2024-07-07 03:13:49 +00:00
Pandora support
This commit is contained in:
parent
6b67ba3a57
commit
f953e235c4
|
@ -1,5 +1,9 @@
|
||||||
cmake_minimum_required(VERSION 2.6)
|
cmake_minimum_required(VERSION 2.6)
|
||||||
|
|
||||||
|
option(GLES2 "Set to ON if targeting a GLES2 device" ${GLES2})
|
||||||
|
option(PANDORA "Set to ON if targeting an OpenPandora" ${PANDORA})
|
||||||
|
option(MUPENPLUSAPI "Set to ON for Mupen64Plus plugin" ${MUPENPLUSAPI})
|
||||||
|
|
||||||
project( GLideN64 )
|
project( GLideN64 )
|
||||||
|
|
||||||
set(GLideN64_SOURCES
|
set(GLideN64_SOURCES
|
||||||
|
@ -41,8 +45,6 @@ set(GLideN64_SOURCES
|
||||||
PostProcessor.cpp
|
PostProcessor.cpp
|
||||||
VI.cpp
|
VI.cpp
|
||||||
common/CommonAPIImpl_common.cpp
|
common/CommonAPIImpl_common.cpp
|
||||||
OGL3X/GLSLCombiner_ogl3x.cpp
|
|
||||||
OGL3X/UniformBlock.cpp
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if(MUPENPLUSAPI)
|
if(MUPENPLUSAPI)
|
||||||
|
@ -115,6 +117,15 @@ if(SDL)
|
||||||
)
|
)
|
||||||
endif(SDL)
|
endif(SDL)
|
||||||
|
|
||||||
|
if(PANDORA)
|
||||||
|
#Pandora as a SGX530, but it should share the bugs and limitations as SGX540
|
||||||
|
add_definitions(
|
||||||
|
-DPANDORA
|
||||||
|
-DPowerVR_SGX_540
|
||||||
|
-DGLES2
|
||||||
|
)
|
||||||
|
endif(PANDORA)
|
||||||
|
|
||||||
SET( ENV{FREETYPE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../freetype )
|
SET( ENV{FREETYPE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../freetype )
|
||||||
FIND_PACKAGE( Freetype REQUIRED )
|
FIND_PACKAGE( Freetype REQUIRED )
|
||||||
include_directories( ${FREETYPE_INCLUDE_DIRS} )
|
include_directories( ${FREETYPE_INCLUDE_DIRS} )
|
||||||
|
@ -139,13 +150,28 @@ if( CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||||
# )
|
# )
|
||||||
endif( CMAKE_BUILD_TYPE STREQUAL "Debug")
|
endif( CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||||
|
|
||||||
find_package(OpenGL REQUIRED)
|
if(GLES2)
|
||||||
include_directories(${OpenGL_INCLUDE_DIRS})
|
add_definitions(
|
||||||
link_directories(${OpenGL_LIBRARY_DIRS})
|
-DGLES2
|
||||||
add_definitions(${OpenGL_DEFINITIONS})
|
)
|
||||||
if(NOT OPENGL_FOUND)
|
list(APPEND GLideN64_SOURCES
|
||||||
message(ERROR " OPENGL not found!")
|
GLES2/GLSLCombiner_gles2.cpp
|
||||||
endif(NOT OPENGL_FOUND)
|
GLES2/UniformSet.cpp
|
||||||
|
)
|
||||||
|
SET(OPENGL_LIBRARIES -lGLESv2 -lEGL)
|
||||||
|
else(GLES2)
|
||||||
|
find_package(OpenGL REQUIRED)
|
||||||
|
include_directories(${OpenGL_INCLUDE_DIRS})
|
||||||
|
link_directories(${OpenGL_LIBRARY_DIRS})
|
||||||
|
add_definitions(${OpenGL_DEFINITIONS})
|
||||||
|
if(NOT OPENGL_FOUND)
|
||||||
|
message(ERROR " OPENGL not found!")
|
||||||
|
endif(NOT OPENGL_FOUND)
|
||||||
|
list(APPEND GLideN64_SOURCES
|
||||||
|
OGL3X/GLSLCombiner_ogl3x.cpp
|
||||||
|
OGL3X/UniformBlock.cpp
|
||||||
|
)
|
||||||
|
endif(GLES2)
|
||||||
|
|
||||||
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
||||||
SET(GCC_CPP11_COMPILE_FLAGS "-std=c++0x -static-libgcc -static-libstdc++")
|
SET(GCC_CPP11_COMPILE_FLAGS "-std=c++0x -static-libgcc -static-libstdc++")
|
||||||
|
|
|
@ -12,8 +12,13 @@ void Config::resetToDefaults()
|
||||||
{
|
{
|
||||||
version = CONFIG_VERSION_CURRENT;
|
version = CONFIG_VERSION_CURRENT;
|
||||||
|
|
||||||
|
#ifdef PANDORA
|
||||||
|
video.fullscreen = 1;
|
||||||
|
video.fullscreenWidth = video.windowedWidth = 800;
|
||||||
|
#else
|
||||||
video.fullscreen = 0;
|
video.fullscreen = 0;
|
||||||
video.fullscreenWidth = video.windowedWidth = 640;
|
video.fullscreenWidth = video.windowedWidth = 640;
|
||||||
|
#endif
|
||||||
video.fullscreenHeight = video.windowedHeight = 480;
|
video.fullscreenHeight = video.windowedHeight = 480;
|
||||||
video.fullscreenRefresh = 60;
|
video.fullscreenRefresh = 60;
|
||||||
video.multisampling = 0;
|
video.multisampling = 0;
|
||||||
|
@ -60,6 +65,8 @@ void Config::resetToDefaults()
|
||||||
font.name.assign("arial.ttf");
|
font.name.assign("arial.ttf");
|
||||||
#elif defined (ANDROID)
|
#elif defined (ANDROID)
|
||||||
font.name.assign("DroidSans.ttf");
|
font.name.assign("DroidSans.ttf");
|
||||||
|
#elif defined (PANDORA)
|
||||||
|
font.name.assign("LiberationMono-Regular.ttf");
|
||||||
#else
|
#else
|
||||||
font.name = "FreeSans.ttf";
|
font.name = "FreeSans.ttf";
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -20,7 +20,11 @@ set(GLideNHQ_SOURCES
|
||||||
TxUtil.cpp
|
TxUtil.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if(PANDORA)
|
||||||
|
include_directories( osal )
|
||||||
|
else(PANDORA)
|
||||||
include_directories( inc osal )
|
include_directories( inc osal )
|
||||||
|
endif(PANDORA)
|
||||||
LINK_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/lib )
|
LINK_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/lib )
|
||||||
|
|
||||||
if(UNIX)
|
if(UNIX)
|
||||||
|
@ -102,10 +106,17 @@ if( NOT GHQCHK )
|
||||||
# set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
|
# set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
|
||||||
# find_library(PNGLIB libpng.a)
|
# find_library(PNGLIB libpng.a)
|
||||||
|
|
||||||
target_link_libraries(GLideNHQ PRIVATE
|
if(PANDORA)
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/lib/libpng.a
|
target_link_libraries(GLideNHQ PRIVATE
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/lib/libz.a
|
/mnt/utmp/codeblocks/usr/lib/libpng.a
|
||||||
)
|
/mnt/utmp/codeblocks/usr/lib/libz.a
|
||||||
|
)
|
||||||
|
else(PANDORA)
|
||||||
|
target_link_libraries(GLideNHQ PRIVATE
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/lib/libpng.a
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/lib/libz.a
|
||||||
|
)
|
||||||
|
endif(PANDORA)
|
||||||
endif( CMAKE_BUILD_TYPE STREQUAL "Release")
|
endif( CMAKE_BUILD_TYPE STREQUAL "Release")
|
||||||
else( NOT GHQCHK )
|
else( NOT GHQCHK )
|
||||||
add_definitions(-DGHQCHK)
|
add_definitions(-DGHQCHK)
|
||||||
|
|
|
@ -18,6 +18,9 @@
|
||||||
#define GL_DRAW_FRAMEBUFFER GL_FRAMEBUFFER
|
#define GL_DRAW_FRAMEBUFFER GL_FRAMEBUFFER
|
||||||
#define GL_READ_FRAMEBUFFER GL_FRAMEBUFFER
|
#define GL_READ_FRAMEBUFFER GL_FRAMEBUFFER
|
||||||
#define GLESX
|
#define GLESX
|
||||||
|
#ifdef PANDORA
|
||||||
|
typedef char GLchar;
|
||||||
|
#endif
|
||||||
#elif defined(GLES3)
|
#elif defined(GLES3)
|
||||||
#include <GLES3/gl3.h>
|
#include <GLES3/gl3.h>
|
||||||
#include <GLES3/gl3ext.h>
|
#include <GLES3/gl3ext.h>
|
||||||
|
|
|
@ -227,6 +227,8 @@ bool getFontFileName(char * _strName)
|
||||||
sprintf(_strName, "%s/Fonts/%s", pSysPath, config.font.name.c_str());
|
sprintf(_strName, "%s/Fonts/%s", pSysPath, config.font.name.c_str());
|
||||||
#elif defined (ANDROID)
|
#elif defined (ANDROID)
|
||||||
sprintf(_strName, "/system/fonts/%s", config.font.name.c_str());
|
sprintf(_strName, "/system/fonts/%s", config.font.name.c_str());
|
||||||
|
#elif defined (PANDORA)
|
||||||
|
sprintf(_strName, "/usr/share/fonts/truetype/%s", config.font.name.c_str());
|
||||||
#else
|
#else
|
||||||
sprintf(_strName, "/usr/share/fonts/truetype/freefont/%s", config.font.name.c_str());
|
sprintf(_strName, "/usr/share/fonts/truetype/freefont/%s", config.font.name.c_str());
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue
Block a user