Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "XCP_Master/source/libs/qtcsv"]
path = XCP_Master/source/libs/qtcsv
url = https://github.com/iamantony/qtcsv.git
branch = qt4_qt5
18 changes: 3 additions & 15 deletions XCP_Master/source/Qt_Open_XCP.pro
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ SOURCES += \
xcpConfig/xcpEvent.cpp \
xcpConfig/xcpHostConfig.cpp \
xcpConfig/xcpOptions.cpp \
libs/libelfin/elf/mman.c

win32:SOURCES += libs/libelfin/elf/mman.c

HEADERS += \
libs/libelfin/dwarf/data.hh \
Expand All @@ -93,15 +94,6 @@ HEADERS += \
libs/libelfin/elf/elf++.hh \
libs/libelfin/elf/mman.h \
libs/libelfin/elf/to_hex.hh \
libs/qtcsv/include/qtcsv/abstractdata.h \
libs/qtcsv/include/qtcsv/qtcsv_global.h \
libs/qtcsv/include/qtcsv/reader.h \
libs/qtcsv/include/qtcsv/stringdata.h \
libs/qtcsv/include/qtcsv/variantdata.h \
libs/qtcsv/include/qtcsv/writer.h \
libs/qtcsv/sources/contentiterator.h \
libs/qtcsv/sources/filechecker.h \
libs/qtcsv/sources/symbols.h \
main/backend.h \
main/controller.h \
main/model.h \
Expand Down Expand Up @@ -142,6 +134,7 @@ HEADERS += \
xcpConfig/xcpHostConfig.h \
xcpConfig/xcpOptions.h

include(libs/qtcsv/qtcsv.pri)

FORMS += \
ui/dialogDeviceEventsInsert.ui \
Expand All @@ -154,8 +147,3 @@ RESOURCES += \

DISTFILES += \
resource/LICENSE.md

win32: LIBS += -L$$PWD/libs/qtcsv/debug/ -lqtcsv1

INCLUDEPATH += $$PWD/libs/qtcsv/debug
DEPENDPATH += $$PWD/libs/qtcsv/debug
6 changes: 5 additions & 1 deletion XCP_Master/source/libs/libelfin/elf/mmap_loader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@

#include <sys/types.h>
#include <sys/stat.h>
#include "mman.h"
#if defined(_WIN32) || defined(_WIN64)
#include "mman.h"
#else
#include <sys/mman.h>
#endif
#include <fcntl.h>
#include <unistd.h>

Expand Down
1 change: 1 addition & 0 deletions XCP_Master/source/libs/qtcsv
Submodule qtcsv added at 5c9045
48 changes: 0 additions & 48 deletions XCP_Master/source/libs/qtcsv/.gitignore

This file was deleted.

22 changes: 0 additions & 22 deletions XCP_Master/source/libs/qtcsv/LICENSE

This file was deleted.

Loading