Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add selection of system LUA and BULLET libs #541

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add selection of system LUA and BULLET libs #541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 52 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ project(OpenTomb)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)

option(FORCE_SYSTEM_FREETYPE "Use system-provided FreeType instead of internal library." OFF)
option(FORCE_SYSTEM_LUA "Use system-provided LUA 5.3+ instead of internal library." OFF)
option(FORCE_SYSTEM_BULLET "Use system-provided BULLET instead of internal library." OFF)

# Detect system FreeType

Expand All @@ -27,12 +29,55 @@ endif ()

if (OPENTOMB_INTERNAL_FREETYPE)
add_subdirectory(extern/freetype2)
set(FREETYPE_INCLUDE_DIRS "")
set(FREETYPE_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/extern/freetype2")
set(FREETYPE_LIBRARIES freetype2)
endif ()

add_subdirectory(extern/bullet)
add_subdirectory(extern/lua)
# Detect system LUA

if (FORCE_SYSTEM_LUA)
find_package(lua QUIET)
if (NOT LUA_FOUND)
message(WARNING "LUA not found. Enabling internal LUA support.")
set(OPENTOMB_INTERNAL_LUA ON)
else ()
# Set minimal version
set (LUA_MIN_VERSION 5.3)
if (LUA_VERSION_STRING VERSION_EQUAL LUA_MIN_VERSION OR LUA_VERSION_STRING VERSION_GREATER LUA_MIN_VERSION)
set(OPENTOMB_INTERNAL_LUA OFF)
else ()
message(WARNING "Incorrect LUA version found. Enabling internal LUA support.")
endif ()
endif ()
else ()
set(OPENTOMB_INTERNAL_LUA ON)
endif ()

if (OPENTOMB_INTERNAL_LUA)
add_subdirectory(extern/lua)
set(LUA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/extern/lua")
set(LUA_LIBRARIES lua5.3)
endif ()

# Detect system BULLET

if (FORCE_SYSTEM_BULLET)
find_package(bullet QUIET)
if (NOT BULLET_FOUND)
message(WARNING "BULLET not found. Enabling internal BULLET support.")
set(OPENTOMB_INTERNAL_BULLET ON)
else()
set(OPENTOMB_INTERNAL_BULLET OFF)
endif ()
else ()
set(OPENTOMB_INTERNAL_BULLET ON)
endif ()

if (OPENTOMB_INTERNAL_BULLET)
add_subdirectory(extern/bullet)
set(BULLET_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/extern/bullet")
set(BULLET_LIBRARIES bullet)
endif ()

set(OPENTOMB_SRCS
src/core/avl.c
Expand Down Expand Up @@ -248,6 +293,8 @@ set_target_properties(${PROJECT_NAME} PROPERTIES C_STANDARD 99 CXX_STANDARD 11)
target_include_directories(
${PROJECT_NAME} PRIVATE
${FREETYPE_INCLUDE_DIRS}
${LUA_INCLUDE_DIR}
${BULLET_INCLUDE_DIRS}
${PNG_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS}
${SDL2_INCLUDE_DIR}
Expand All @@ -257,9 +304,9 @@ target_include_directories(

target_link_libraries(
${PROJECT_NAME}
bullet
${FREETYPE_LIBRARIES}
lua5.3
${LUA_LIBRARIES}
${BULLET_LIBRARIES}
${PNG_LIBRARIES}
${OPENAL_LIBRARY}
${SDL2_LIBRARY}
Expand Down
7 changes: 1 addition & 6 deletions src/controls.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,7 @@
#include <SDL2/SDL_scancode.h>
#include <SDL2/SDL_events.h>

extern "C" {
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
}

#include "core/lua.h"
#include "core/system.h"
#include "core/console.h"
#include "core/vmath.h"
Expand Down
7 changes: 3 additions & 4 deletions src/core/console.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@

#include <stdio.h>
#include <stdlib.h>
#include <memory.h>

#include <SDL2/SDL_platform.h>
#include <SDL2/SDL_opengl.h>
#include <SDL2/SDL_keycode.h>

#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
#include <memory.h>
#include "../core/lua.h"

#include "utf8_32.h"
#include "gl_font.h"
Expand Down
16 changes: 16 additions & 0 deletions src/core/lua.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#ifndef __OT_CORE_LUA_H
#define __OT_CORE_LUA_H

#ifdef __cplusplus
extern "C" {
#endif

#include "lua.h"
#include "lualib.h"
#include "lauxlib.h"

#ifdef __cplusplus
}
#endif

#endif /* __OT_CORE_LUA_H */
4 changes: 1 addition & 3 deletions src/core/system.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@
#include <stdlib.h>
#include <string.h>

#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
#include "../core/lua.h"

#include "system.h"
#include "utf8_32.h"
Expand Down
6 changes: 1 addition & 5 deletions src/engine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,8 @@
#include <ctype.h>
#include <time.h>

extern "C" {
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
}

#include "core/lua.h"
#include "core/system.h"
#include "core/gl_util.h"
#include "core/gl_font.h"
Expand Down
7 changes: 1 addition & 6 deletions src/entity.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
#include <stdlib.h>
#include <math.h>

extern "C" {
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
}

#include "core/lua.h"
#include "core/console.h"
#include "core/vmath.h"
#include "core/obb.h"
Expand Down
7 changes: 1 addition & 6 deletions src/game.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,7 @@
#include <stdlib.h>
#include <stdio.h>

extern "C" {
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
}

#include "core/lua.h"
#include "core/system.h"
#include "core/console.h"
#include "core/vmath.h"
Expand Down
7 changes: 1 addition & 6 deletions src/gameflow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
extern "C" {
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
}

#include "core/lua.h"
#include "core/gl_text.h"
#include "core/console.h"
#include "script/script.h"
Expand Down
6 changes: 1 addition & 5 deletions src/physics/hair.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@

#include <stdlib.h>
extern "C" {
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
}

#include "../core/lua.h"
#include "hair.h"

struct hair_setup_s *Hair_GetSetup(struct lua_State *lua, int stack_pos)
Expand Down
6 changes: 1 addition & 5 deletions src/physics/ragdoll.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@

#include <stdlib.h>
#include <string.h>
extern "C" {
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
}

#include "../core/lua.h"
#include "../core/vmath.h"
#include "ragdoll.h"
#include "../mesh.h"
Expand Down
7 changes: 1 addition & 6 deletions src/resource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,7 @@
#include <stdlib.h>
#include <SDL2/SDL.h>

extern "C" {
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
}

#include "core/lua.h"
#include "core/system.h"
#include "core/vmath.h"
#include "core/gl_util.h"
Expand Down
6 changes: 1 addition & 5 deletions src/script/script.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@
#include <stdlib.h>
#include <string.h>

extern "C" {
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
}
#include "../core/lua.h"

#include "script.h"
#include "../core/system.h"
Expand Down
6 changes: 1 addition & 5 deletions src/script/script_audio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@
#include <stdlib.h>
#include <string.h>

extern "C" {
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
}
#include "../core/lua.h"

#include "script.h"

Expand Down
6 changes: 1 addition & 5 deletions src/script/script_character.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@
#include <stdlib.h>
#include <string.h>

extern "C" {
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
}
#include "../core/lua.h"

#include "script.h"

Expand Down
6 changes: 1 addition & 5 deletions src/script/script_entity.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@
#include <stdlib.h>
#include <string.h>

extern "C" {
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
}
#include "../core/lua.h"

#include "script.h"

Expand Down
6 changes: 1 addition & 5 deletions src/script/script_skeletal_model.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@
#include <stdlib.h>
#include <string.h>

extern "C" {
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
}
#include "../core/lua.h"

#include "script.h"

Expand Down
6 changes: 1 addition & 5 deletions src/script/script_world.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@
#include <stdlib.h>
#include <string.h>

extern "C" {
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
}
#include "../core/lua.h"

#include "script.h"

Expand Down
7 changes: 1 addition & 6 deletions src/trigger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@
#include <SDL2/SDL.h>
#include <SDL2/SDL_rwops.h>

extern "C" {
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
}

#include "core/lua.h"
#include "core/system.h"
#include "core/console.h"
#include "core/vmath.h"
Expand Down
7 changes: 1 addition & 6 deletions src/world.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@
#include <SDL2/SDL.h>
#include <SDL2/SDL_rwops.h>

extern "C" {
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
}

#include "core/lua.h"
#include "core/avl.h"
#include "core/gl_util.h"
#include "core/console.h"
Expand Down