Skip to content
Extraits de code Groupes Projets
Vérifiée Valider b438820e rédigé par Kubat's avatar Kubat
Parcourir les fichiers

BUILD: Fix compile and SEGV

parent fba769bf
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!10UI improvements
...@@ -5,6 +5,9 @@ project(Vivy VERSION 0.1 LANGUAGES CXX) ...@@ -5,6 +5,9 @@ project(Vivy VERSION 0.1 LANGUAGES CXX)
cmake_policy(SET CMP0100 NEW) # Let cmake use moc and uic for .hh files cmake_policy(SET CMP0100 NEW) # Let cmake use moc and uic for .hh files
cmake_policy(SET CMP0009 NEW) # Do not follow symlinks with GLOB_RECURSE cmake_policy(SET CMP0009 NEW) # Do not follow symlinks with GLOB_RECURSE
# Pass -fPIC
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
# For Qt # For Qt
set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
Simply use cmake to build in another folder of the source folder: Simply use cmake to build in another folder of the source folder:
``` ```
cmake -Bbuild -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_COMPILER=clang cmake -Bbuild -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang
``` ```
If you want to use the `compile_commands.json`, use the If you want to use the `compile_commands.json`, use the
......
#include "VivyApplication.hh" #include "VivyApplication.hh"
#include "UI/MainWindow.hh" #include "UI/MainWindow.hh"
#include <QtGlobal>
#include <QIcon> #include <QIcon>
#include <QFontDatabase> #include <QFontDatabase>
using namespace Vivy; using namespace Vivy;
VivyApplication::VivyApplication(int argc, char **argv) VivyApplication::VivyApplication(int &argc, char **argv)
: QApplication(argc, argv) : QApplication(argc, argv)
{ {
} }
...@@ -60,4 +61,7 @@ VivyApplication::getApplicationFont(Font id) const noexcept ...@@ -60,4 +61,7 @@ VivyApplication::getApplicationFont(Font id) const noexcept
case Font::Default: case Font::Default:
return QFont(QFontDatabase::applicationFontFamilies(fontIdRegular).at(0)); return QFont(QFontDatabase::applicationFontFamilies(fontIdRegular).at(0));
} }
// Let the program crash
qFatal("UNREACHABLE");
} }
...@@ -43,7 +43,7 @@ private: ...@@ -43,7 +43,7 @@ private:
int fontIdBoldItalic; int fontIdBoldItalic;
public: public:
VivyApplication(int argc, char **argv); VivyApplication(int &argc, char **argv);
~VivyApplication() = default; ~VivyApplication() = default;
int exec() noexcept; int exec() noexcept;
......
...@@ -5,6 +5,9 @@ if(WIN32) ...@@ -5,6 +5,9 @@ if(WIN32)
add_definitions(-D_CRT_SECURE_NO_WARNINGS) add_definitions(-D_CRT_SECURE_NO_WARNINGS)
endif() endif()
# Pass -fPIC
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
file(GLOB Lua_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.c") file(GLOB Lua_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.c")
file(GLOB Lua_INC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.h") file(GLOB Lua_INC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.h")
list(REMOVE_ITEM Lua_SRC "src/lua.c" "src/luac.c") list(REMOVE_ITEM Lua_SRC "src/lua.c" "src/luac.c")
...@@ -12,5 +15,9 @@ list(REMOVE_ITEM Lua_SRC "src/lua.c" "src/luac.c") ...@@ -12,5 +15,9 @@ list(REMOVE_ITEM Lua_SRC "src/lua.c" "src/luac.c")
add_library(lua STATIC ${Lua_SRC} ${Lua_INC}) add_library(lua STATIC ${Lua_SRC} ${Lua_INC})
target_include_directories(lua PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/src/") target_include_directories(lua PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/src/")
if(UNIX)
target_link_libraries(lua m)
endif()
add_executable(lua-cli src/lua.c) add_executable(lua-cli src/lua.c)
target_link_libraries(lua-cli PRIVATE lua) target_link_libraries(lua-cli PRIVATE lua)
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter