Proyecto-Titulo/obelisk
3
0
Fork 0
Code Issues Pull Requests Releases 5 Wiki Activity

feature/kb #14

Merged
cromer merged 27 commits from feature/kb into develop 2023-02-23 01:09:37 -03:00
Conversation 0 Commits 27 Files Changed 53 +5 -5
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6ef6d14d18 - Show all commits

2
src/lib/meson.build
View File

@ -22,7 +22,7 @@ lib = library('obelisk',
install : true install : true
) )
libobelisk_dep = declare_dependency( libobelisk = declare_dependency(
include_directories : incdirs, include_directories : incdirs,
link_with : lib, link_with : lib,
sources : obelisk_lib_sources sources : obelisk_lib_sources

4
src/obelisk.cpp → src/main.cpp
View File

@ -1,9 +1,9 @@
#include "knowledge_base.h" #include "knowledge_base.h"
#include "lexer.h" #include "lexer.h"
#include "lib/include/obelisk.h" #include "main.h"
#include "lib/version.h"
#include "obelisk.h" #include "obelisk.h"
#include "parser.h" #include "parser.h"
#include "version.h"
#include <iomanip> #include <iomanip>
#include <iostream> #include <iostream>

0
src/obelisk.h → src/main.h
View File

4
src/meson.build
View File

@ -1,7 +1,7 @@
subdir('lib') subdir('lib')
obelisk_sources = files( obelisk_sources = files(
'obelisk.cpp', 'main.cpp',
'lexer.cpp', 'lexer.cpp',
'parser.cpp', 'parser.cpp',
'knowledge_base.cpp' 'knowledge_base.cpp'
@ -23,7 +23,7 @@ link_args = ' ' + r.stdout().replace('\n', ' ')
executable('obelisk', executable('obelisk',
obelisk_sources, obelisk_sources,
dependencies : [libobelisk_dep, sqlite3], dependencies : [libobelisk, sqlite3],
cpp_args : cpp_args.split(), cpp_args : cpp_args.split(),
link_args : link_args.split(), link_args : link_args.split(),
install : true install : true