Transition from QtCore to stdc++ / STL / boost
This looks like a pretty major change, but in reality, 80% of it is just renames of types and corresponding methods. The config parsing code has been completely replaced with a boost::program_options based version. This means that the config file format slightly changed (checkout the updated README). I still expect there to be bugs / unforseen events. Those should be fixed in follow up commits. Also, finally reverted back to using pkg-config to locate and link libruby. Yay for less hacks!
This commit is contained in:
parent
01529c5741
commit
2adf8ab265
40 changed files with 722 additions and 456 deletions
40
mkxp.pro
40
mkxp.pro
|
@ -5,7 +5,29 @@ QT =
|
|||
TARGET = mkxp
|
||||
DEPENDPATH += src shader assets
|
||||
INCLUDEPATH += . src
|
||||
QMAKE_LFLAGS += '-Wl,-rpath,\'\$$ORIGIN/lib\''
|
||||
LIBS += -lGL
|
||||
|
||||
# Deal with boost paths...
|
||||
isEmpty(BOOST_I) {
|
||||
BOOST_I = $$(BOOST_I)
|
||||
}
|
||||
isEmpty(BOOST_I) {}
|
||||
else {
|
||||
INCLUDEPATH += $$BOOST_I
|
||||
}
|
||||
|
||||
isEmpty(BOOST_L) {
|
||||
BOOST_L = $$(BOOST_L)
|
||||
}
|
||||
isEmpty(BOOST_L) {}
|
||||
else {
|
||||
LIBS += -L$$BOOST_L
|
||||
}
|
||||
|
||||
LIBS += -lboost_program_options
|
||||
|
||||
|
||||
CONFIG(release, debug|release): DEFINES += NDEBUG
|
||||
|
||||
isEmpty(BINDING) {
|
||||
BINDING = BINDING_MRI
|
||||
|
@ -19,18 +41,14 @@ RGSS2 {
|
|||
|
||||
unix {
|
||||
CONFIG += link_pkgconfig
|
||||
PKGCONFIG += QtCore sigc++-2.0 glew pixman-1 zlib \
|
||||
physfs sdl2 SDL2_image SDL2_ttf SDL_sound \
|
||||
openal
|
||||
PKGCONFIG += sigc++-2.0 glew pixman-1 zlib physfs \
|
||||
sdl2 SDL2_image SDL2_ttf SDL_sound openal
|
||||
|
||||
RGSS2 {
|
||||
PKGCONFIG += vorbisfile
|
||||
}
|
||||
}
|
||||
|
||||
# 'slots' keyword fucks with libsigc++
|
||||
DEFINES += QT_NO_KEYWORDS
|
||||
|
||||
# Input
|
||||
HEADERS += \
|
||||
src/quadarray.h \
|
||||
|
@ -72,7 +90,9 @@ HEADERS += \
|
|||
src/tileatlas.h \
|
||||
src/perftimer.h \
|
||||
src/sharedstate.h \
|
||||
src/al-util.h
|
||||
src/al-util.h \
|
||||
src/boost-hash.h \
|
||||
src/debugwriter.h
|
||||
|
||||
SOURCES += \
|
||||
src/main.cpp \
|
||||
|
@ -185,9 +205,7 @@ BINDING_MRUBY {
|
|||
}
|
||||
|
||||
BINDING_MRI {
|
||||
LIBS += ./ruby/libruby.so
|
||||
INCLUDEPATH += ruby/include ruby/.ext/include/x86_64-linux # need i386 paths here too!
|
||||
DEPENDPATH += ruby/include ruby/.ext/include/x86_64-linux
|
||||
PKGCONFIG += ruby-2.1
|
||||
DEFINES += BINDING_MRI
|
||||
|
||||
# EMBED2 = binding-mri/module_rpg.rb
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue