mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-10-18 20:39:27 +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
commit d34a962e78
6 changed files with 34 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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 "")
include(freetype2.cmake) # Nothing else uses freetype2 directly
INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${EXTLIBDIR}) # For <GL/gl.h>
add_subdirectory(FTGL)
else()
find_package(FTGL REQUIRED)

22
ExternalLibs/FTGL/include/FTGL.h
View file

@ -18,10 +18,10 @@ typedef float FTGL_FLOAT;
#define FT_RENDER_MODE_NORMAL ft_render_mode_normal
#endif
#ifdef WIN32
// Under windows avoid including <windows.h> is overrated.
// Under windows avoid including <windows.h> is overrated.
// Sure, it can be avoided and "name space pollution" can be
// avoided, but why? It really doesn't make that much difference
// these days.
@ -35,7 +35,7 @@ typedef float FTGL_FLOAT;
#else
// Non windows platforms - don't require nonsense as seen above :-)
// Non windows platforms - don't require nonsense as seen above :-)
#if 1
#include "GL/gl.h"
//#include "GL/glu.h"
@ -47,12 +47,12 @@ typedef float FTGL_FLOAT;
#else
#include <GL/gl.h>
#include <GL/glu.h>
#endif
#endif
#endif
#endif
// Required for compatibility with glext.h style function definitions of
// Required for compatibility with glext.h style function definitions of
// OpenGL extensions, such as in src/osg/Point.cpp.
#ifndef APIENTRY
#define APIENTRY
@ -60,7 +60,7 @@ typedef float FTGL_FLOAT;
#endif
// Compiler-specific conditional compilation
#ifdef _MSC_VER // MS Visual C++
#ifdef _MSC_VER // MS Visual C++
// Disable various warning.
// 4786: template name too long
@ -71,21 +71,21 @@ typedef float FTGL_FLOAT;
// The following definitions control how symbols are exported.
// If the target is a static library ensure that FTGL_LIBRARY_STATIC
// is defined. If building a dynamic library (ie DLL) ensure the
// FTGL_LIBRARY macro is defined, as it will mark symbols for
// export. If compiling a project to _use_ the _dynamic_ library
// version of the library, no definition is required.
// FTGL_LIBRARY macro is defined, as it will mark symbols for
// export. If compiling a project to _use_ the _dynamic_ library
// version of the library, no definition is required.
#ifdef FTGL_LIBRARY_STATIC // static lib - no special export required
# define FTGL_EXPORT
#elif FTGL_LIBRARY // dynamic lib - must export/import symbols appropriately.
# define FTGL_EXPORT __declspec(dllexport)
#else
# define FTGL_EXPORT __declspec(dllimport)
#endif
#endif
#else
// Compiler that is not MS Visual C++.
// Ensure that the export symbol is defined (and blank)
#define FTGL_EXPORT
#endif
#endif
#endif // __FTGL__

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

@ -61,4 +61,19 @@ set(lua51_src
# Use C++ exceptions instead of setjmp() & longjmp()
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})

1
ExternalLibs/oggvorbis.cmake
View file

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