Fixed errors preventing a build on linux

Gui_Panel_Refactor
Joey Pollack 4 years ago
parent 8ad6eb2880
commit d4e294789d

@ -148,10 +148,10 @@ target_link_directories(${PROJECT_NAME}
PRIVATE src/run_modes/tester PRIVATE src/run_modes/tester
PRIVATE external/glad/src PRIVATE external/glad/src
PRIVATE external/freetype/src PRIVATE external/freetype/src
PRIVATE external/box2d/src PRIVATE external/box2d/bin
) )
target_link_libraries(${PROJECT_NAME} glfw glad glm dearimgui utils assets lua_static pugixml freetype box2d tester editor) target_link_libraries(${PROJECT_NAME} box2d glfw glad glm dearimgui utils assets lua_static pugixml freetype tester editor)
if(WIN32) if(WIN32)
target_link_libraries(${PROJECT_NAME} opengl32.lib) target_link_libraries(${PROJECT_NAME} opengl32.lib)

@ -2,4 +2,11 @@
# This script expects to be run from the parent directory # This script expects to be run from the parent directory
# ex. scripts/cmconfig.sh # ex. scripts/cmconfig.sh
cmake -Wno-dev -DNO_EDITOR=OFF -DGLFW_BUILD_DOCS=OFF -DBOX2D_BUILD_TESTBED=OFF -S . -B build/ if [ "$1" = "noedit" ]
then
echo "no editor"
cmake -Wno-dev -DNO_EDITOR=ON -DGLFW_BUILD_DOCS=OFF -DBOX2D_BUILD_TESTBED=OFF -S . -B build/
else
echo "including editor"
cmake -Wno-dev -DNO_EDITOR=OFF -DGLFW_BUILD_DOCS=OFF -DBOX2D_BUILD_TESTBED=OFF -S . -B build/
fi

@ -233,7 +233,7 @@ namespace lunarium
else if (RunMode::MODE_EDITOR == mState.Mode) else if (RunMode::MODE_EDITOR == mState.Mode)
{ {
#if BUILD_NO_EDITOR #if BUILD_NO_EDITOR
Logger::Log(mLogCat, LogLevel::FATAL_ERROR, "The Editor is not available with this build"); Logger::Log(LogCategory::CORE, LogLevel::FATAL_ERROR, "The Editor is not available with this build");
return; return;
#else #else
mpRunMode = new Editor; mpRunMode = new Editor;

@ -9,6 +9,8 @@
#include "fileBrowser.h" #include "fileBrowser.h"
#include <algorithm>
#include <cstring>
#include <core/core.h> #include <core/core.h>
#include <assets/types/image.h> #include <assets/types/image.h>
#include <graphics/igraphics.h> #include <graphics/igraphics.h>
@ -181,7 +183,7 @@ namespace lunarium
{ {
if (std::filesystem::is_directory(lhs) && std::filesystem::is_directory(rhs)) if (std::filesystem::is_directory(lhs) && std::filesystem::is_directory(rhs))
{ {
return strcmpi(lhs.filename().string().c_str(), rhs.filename().string().c_str()) < 0; return strcmp(lhs.filename().string().c_str(), rhs.filename().string().c_str()) < 0;
} }
if (std::filesystem::is_directory(lhs) && !std::filesystem::is_directory(rhs)) if (std::filesystem::is_directory(lhs) && !std::filesystem::is_directory(rhs))

@ -9,3 +9,5 @@ target_include_directories(tester
PUBLIC ../../../external/glfw/include PUBLIC ../../../external/glfw/include
PUBLIC ../../../external/box2d/include PUBLIC ../../../external/box2d/include
) )
target_link_libraries(tester box2d)

@ -7,7 +7,6 @@
******************************************************************************/ ******************************************************************************/
#include "physicsScene.h" #include "physicsScene.h"
#include <box2d/box2d.h>
#include <core/core.h> #include <core/core.h>
#include <graphics/igraphics.h> #include <graphics/igraphics.h>
#include <utils/logger.h> #include <utils/logger.h>

@ -10,11 +10,7 @@
#define PHYSICS_SCENE_H_ #define PHYSICS_SCENE_H_
#include "baseScene.h" #include "baseScene.h"
#include <box2d/box2d.h>
class b2World;
class b2Body;
class b2PolygonShape;
class b2AABB;
namespace lunarium namespace lunarium
{ {

@ -10,7 +10,7 @@
#include "scenes/simpleRenderScene.h" #include "scenes/simpleRenderScene.h"
#include "scenes/physicsScene.h" #include "scenes/physicsScene.h"
#include <core/Core.h> #include <core/core.h>
#include <utils/logger.h> #include <utils/logger.h>
#include <graphics/igraphics.h> #include <graphics/igraphics.h>
#include <LunariumConfig.h> #include <LunariumConfig.h>

Loading…
Cancel
Save