natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix build issues on Mac OS

Browse Source
This commit is contained in:
Skarn
2022-01-27 15:51:23 +03:00
parent e5bfb4c703
commit 433be0a46d
8 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -366,8 +366,8 @@ add_custom_command(TARGET noggit POST_BUILD
SET_PROPERTY(TARGET noggit PROPERTY AUTOMOC ON)
IF(APPLE)
TARGET_INCLUDE_DIRECTORIES(noggit PRIVATE /usr/local/Cellar/llvm/12.0.1/include/c++/v1/)
TARGET_LINK_LIBRARIES(noggit /usr/local/Cellar/llvm/12.0.1/lib/libc++.1.0.dylib)
TARGET_INCLUDE_DIRECTORIES(noggit PRIVATE /usr/local/Cellar/llvm/13.0.0_2/include/c++/v1/)
TARGET_LINK_LIBRARIES(noggit /usr/local/Cellar/llvm/13.0.0_2/lib/libc++.1.0.dylib)
ENDIF()
SET(_noggit_revision_output_dir "${CMAKE_BINARY_DIR}/revision_output")

1
src/math/ray.cpp
View File

@@ -3,6 +3,7 @@
#include <math/ray.hpp>
#include <limits>
#include <algorithm>
namespace math
{

2
src/noggit/ModelInstance.cpp
View File

@@ -13,6 +13,8 @@
#include <opengl/scoped.hpp>
#include <opengl/shader.hpp>
#include <sstream>
ModelInstance::ModelInstance(BlizzardArchive::Listfile::FileKey const& file_key
, Noggit::NoggitRenderContext context)
: SceneObject(SceneObjectTypes::eMODEL, context)

2
src/noggit/Selection.cpp
View File

@@ -2,6 +2,8 @@
#include <noggit/MapChunk.h>
#include <noggit/DBC.h>
#include <sstream>
void selected_chunk_type::updateDetails(Noggit::Ui::detail_infos* detail_widget)
{

2
src/noggit/WMOInstance.cpp
View File

@@ -11,6 +11,8 @@
#include <noggit/rendering/Primitives.hpp>
#include <opengl/scoped.hpp>
#include <sstream>
WMOInstance::WMOInstance(BlizzardArchive::Listfile::FileKey const& file_key, ENTRY_MODF const* d, Noggit::NoggitRenderContext context)
: SceneObject(SceneObjectTypes::eWMO, context)
, wmo(file_key, context)

1
src/noggit/ui/tools/NodeEditor/Nodes/Logic/LogicReturnNode.cpp
View File

@@ -6,6 +6,7 @@
#include <noggit/ui/tools/NodeEditor/Nodes/DataTypes/GenericData.hpp>
#include <QInputDialog>
#include <sstream>
using namespace Noggit::Ui::Tools::NodeEditor::Nodes;

4
src/noggit/ui/windows/projectCreation/NoggitProjectCreationDialog.cpp
View File

@@ -34,13 +34,13 @@ NoggitProjectCreationDialog::NoggitProjectCreationDialog(ProjectInformation& pro
);
QObject::connect(ui->projectPathField_browse, &QPushButton::clicked
, [&]
, [this]
{
QSettings settings;
auto defaultPath = settings.value("project/game_path").toString();
ui->projectPathField->setText(defaultPath);
QString folderName = QFileDialog::getExistingDirectory(parent, "Select Client Directory", defaultPath, QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
QString folderName = QFileDialog::getExistingDirectory(this, "Select Client Directory", defaultPath, QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
ui->projectPathField->setText(folderName);
}
);

2
src/opengl/scoped.ipp
View File

@@ -106,7 +106,7 @@ namespace OpenGL
//: type == GL_SHADER_STORAGE_BUFFER ? GL_SHADER_STORAGE_BUFFER_BINDING
: type == GL_TRANSFORM_FEEDBACK_BUFFER ? GL_TRANSFORM_FEEDBACK_BUFFER_BINDING
: type == GL_UNIFORM_BUFFER ? GL_UNIFORM_BUFFER_BINDING
: type == GL_TEXTURE_BUFFER ? GL_TEXTURE_BUFFER_BINDING
: type == GL_TEXTURE_BUFFER ? GL_TEXTURE_BINDING_BUFFER
: throw std::logic_error ("bad bind target")
, reinterpret_cast<GLint*> (&_old)
);