Merge branch 'main' of https://github.com/NickJohn547745/XPlor into feature/parse_menu_items
This commit is contained in:
commit
0548e383ce
@ -4,8 +4,8 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
|
|||||||
|
|
||||||
CONFIG += c++17
|
CONFIG += c++17
|
||||||
|
|
||||||
#INCLUDEPATH += "C:/Program Files (x86)/Windows Kits/10/Include/10.0.26100.0/um"
|
# INCLUDEPATH += "C:/Program Files (x86)/Windows Kits/10/Include/10.0.26100.0/um"
|
||||||
#LIBS += -L"C:/Program Files (x86)/Windows Kits/10/Lib/10.0.26100.0/um/x64" \
|
# LIBS += -L"C:/Program Files (x86)/Windows Kits/10/Lib/10.0.26100.0/um/x64" \
|
||||||
# -ldxcompiler
|
# -ldxcompiler
|
||||||
|
|
||||||
# You can make your code fail to compile if it uses deprecated APIs.
|
# You can make your code fail to compile if it uses deprecated APIs.
|
||||||
@ -18,12 +18,9 @@ SOURCES += \
|
|||||||
|
|
||||||
HEADERS += \
|
HEADERS += \
|
||||||
enums.h \
|
enums.h \
|
||||||
localize.h \
|
|
||||||
mainwindow.h \
|
mainwindow.h \
|
||||||
rawfile.h \
|
|
||||||
structs.h \
|
structs.h \
|
||||||
utils.h \
|
utils.h
|
||||||
zone.h
|
|
||||||
|
|
||||||
FORMS += \
|
FORMS += \
|
||||||
mainwindow.ui
|
mainwindow.ui
|
||||||
@ -64,9 +64,6 @@
|
|||||||
#include <Qt3DExtras/QNormalDiffuseMapMaterial>
|
#include <Qt3DExtras/QNormalDiffuseMapMaterial>
|
||||||
|
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <dxcapi.h>
|
|
||||||
#include <atlbase.h>
|
|
||||||
#include <atlcom.h>
|
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user