Merge branch 'main' of https://github.com/NickJohn547745/XPlor into feature/parse_menu_items

This commit is contained in:
= 2025-01-11 10:34:43 -05:00
commit 0548e383ce
2 changed files with 4 additions and 10 deletions

View File

@ -4,9 +4,9 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
CONFIG += c++17
#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" \
# -ldxcompiler
# 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" \
# -ldxcompiler
# You can make your code fail to compile if it uses deprecated APIs.
# In order to do so, uncomment the following line.
@ -18,12 +18,9 @@ SOURCES += \
HEADERS += \
enums.h \
localize.h \
mainwindow.h \
rawfile.h \
structs.h \
utils.h \
zone.h
utils.h
FORMS += \
mainwindow.ui

View File

@ -64,9 +64,6 @@
#include <Qt3DExtras/QNormalDiffuseMapMaterial>
#include <windows.h>
#include <dxcapi.h>
#include <atlbase.h>
#include <atlcom.h>
QT_BEGIN_NAMESPACE
namespace Ui {