mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-02-25 15:33:57 +00:00
Code Issues Releases Wiki Activity

fix linux/gcc build

Browse source
This commit is contained in:
fgenesis 2022-04-07 03:11:24 +02:00
parent 49b9e0f05a
commit d34a962e78
6 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
BBGE/FmodOpenALBridge.cpp
View file

@ -51,6 +51,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#undef min #undef min
#undef max #undef max
// HACK: Fix this == NULL checks with GCC 6 and up
#if defined(__GNUC__) || defined (__clang__)
#pragma GCC optimize("no-delete-null-pointer-checks")
#endif
// HACK: global because OpenAL has only one listener anyway // HACK: global because OpenAL has only one listener anyway
static FMOD_VECTOR s_listenerPos; static FMOD_VECTOR s_listenerPos;

2
BBGE/OpenGLStubs.h
View file

@ -96,4 +96,4 @@ GL_FUNC(void,glGetTexImage,(GLenum target, GLint level, GLenum format, GLenum ty
//GL_FUNC(void,glTexImage1D,(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels),(target,level,internalFormat,width,border,format,type,pixels),) //GL_FUNC(void,glTexImage1D,(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels),(target,level,internalFormat,width,border,format,type,pixels),)
GL_FUNC(void,glTexImage2D,(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels),(target,level,internalFormat,width,height,border,format,type,pixels),) GL_FUNC(void,glTexImage2D,(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels),(target,level,internalFormat,width,height,border,format,type,pixels),)
//GL_FUNC(void,glTexImage3D,(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels),(target,level,internalformat,width,height,depth,border,format,type,pixels),) //GL_FUNC(void,glTexImage3D,(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels),(target,level,internalformat,width,height,depth,border,format,type,pixels),)
GL_FUNC(void,glGetTexParameteriv,(GLenum target, GLenum pname, GLint *params),(target,pname,params),); GL_FUNC(void,glGetTexParameteriv,(GLenum target, GLenum pname, GLint *params),(target,pname,params),)

1
ExternalLibs/FTGL.cmake
View file

@ -5,6 +5,7 @@ if(AQUARIA_INTERNAL_FTGL)
set(FTGL_INCLUDE_DIRS "${FTGLDIR}/include;${FREETYPE_INCLUDE_DIRS}" CACHE INTERNAL "") set(FTGL_INCLUDE_DIRS "${FTGLDIR}/include;${FREETYPE_INCLUDE_DIRS}" CACHE INTERNAL "")
include(freetype2.cmake) # Nothing else uses freetype2 directly include(freetype2.cmake) # Nothing else uses freetype2 directly
INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${EXTLIBDIR}) # For <GL/gl.h>
add_subdirectory(FTGL) add_subdirectory(FTGL)
else() else()
find_package(FTGL REQUIRED) find_package(FTGL REQUIRED)

15
ExternalLibs/lua-5.1.4/CMakeLists.txt
View file

@ -61,4 +61,19 @@ set(lua51_src
# Use C++ exceptions instead of setjmp() & longjmp() # Use C++ exceptions instead of setjmp() & longjmp()
set_source_files_properties(${lua51_src} PROPERTIES LANGUAGE CXX) set_source_files_properties(${lua51_src} PROPERTIES LANGUAGE CXX)
# Windows is detected automatically
if(LINUX)
ADD_DEFINITIONS(-DLUA_USE_LINUX)
elseif(APPLE)
ADD_DEFINITIONS(-DLUA_USE_MACOSX)
elseif(POSIX)
ADD_DEFINITIONS(-DLUA_USE_POSIX)
else()
# gcc/ld warns about tmpnam() so we might as well try to get rid of it
CHECK_FUNCTION_EXISTS(mkstemp HAVE_MKSTEMP)
IF(HAVE_MKSTEMP)
ADD_DEFINITIONS(-DLUA_USE_MKSTEMP)
ENDIF()
endif()
add_library(lua51 ${lua51_src}) add_library(lua51 ${lua51_src})

1
ExternalLibs/oggvorbis.cmake
View file

@ -32,6 +32,7 @@ if(AQUARIA_INTERNAL_OGGVORBIS)
${LIBVORBISDIR}/lib/vorbisfile.c ${LIBVORBISDIR}/lib/vorbisfile.c
${LIBVORBISDIR}/lib/window.c ${LIBVORBISDIR}/lib/window.c
) )
target_link_libraries(libvorbis libogg)
else() else()
# CMake doesn't seem to have a module for libogg or libvorbis yet, so # CMake doesn't seem to have a module for libogg or libvorbis yet, so
# we roll our own based on existing find_package modules. # we roll our own based on existing find_package modules.