From af07d2d7bf5bb38aa3bdf43754711a57df4b7cc2 Mon Sep 17 00:00:00 2001 From: = Date: Sat, 11 Jan 2025 01:10:57 -0500 Subject: [PATCH 1/4] Remove dxcomiler dlls and whatnot. --- Data.qrc | 3 --- FastFile_WaW.pro | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Data.qrc b/Data.qrc index ef1b2c8..0325361 100644 --- a/Data.qrc +++ b/Data.qrc @@ -21,7 +21,4 @@ data/d3dbsp/asset_viewer.d3dbsp data/d3dbsp/barebones.d3dbsp - - data/dlls/dxcompiler.dll - diff --git a/FastFile_WaW.pro b/FastFile_WaW.pro index 9a488b9..c155886 100644 --- a/FastFile_WaW.pro +++ b/FastFile_WaW.pro @@ -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. From 47c517db964040ea1509d7289309136cfccdbeef Mon Sep 17 00:00:00 2001 From: = Date: Sat, 11 Jan 2025 01:11:39 -0500 Subject: [PATCH 2/4] Remove dxcomiler dlls and whatnot. --- mainwindow.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/mainwindow.h b/mainwindow.h index e1d1296..cfee96c 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -59,9 +59,6 @@ #include #include -#include -#include -#include QT_BEGIN_NAMESPACE namespace Ui { From 5f2385b0a8482a3628b5c38efdf75ef6c6049c2c Mon Sep 17 00:00:00 2001 From: = Date: Sat, 11 Jan 2025 10:28:44 -0500 Subject: [PATCH 3/4] Renamed project files. --- FastFile_WaW.pro => XPlor.pro | 0 FastFile_WaW.pro.user => XPlor.pro.user | 22 ++++++++++------------ 2 files changed, 10 insertions(+), 12 deletions(-) rename FastFile_WaW.pro => XPlor.pro (100%) rename FastFile_WaW.pro.user => XPlor.pro.user (94%) diff --git a/FastFile_WaW.pro b/XPlor.pro similarity index 100% rename from FastFile_WaW.pro rename to XPlor.pro diff --git a/FastFile_WaW.pro.user b/XPlor.pro.user similarity index 94% rename from FastFile_WaW.pro.user rename to XPlor.pro.user index 4e96dc1..b77ffa5 100644 --- a/FastFile_WaW.pro.user +++ b/XPlor.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -95,13 +95,13 @@ Desktop Qt 6.8.1 MSVC2022 64bit Desktop Qt 6.8.1 MSVC2022 64bit qt.qt6.681.win64_msvc2022_64_kit - 1 + 0 0 0 0 - C:\Users\njohnson\Projects\FastFile_WaW\build\Desktop_Qt_6_8_1_MSVC2022_64bit-Debug - C:/Users/njohnson/Projects/FastFile_WaW/build/Desktop_Qt_6_8_1_MSVC2022_64bit-Debug + C:\Users\njohnson\Projects\XPlor\build\Desktop_Qt_6_8_1_MSVC2022_64bit-Debug + C:/Users/njohnson/Projects/XPlor/build/Desktop_Qt_6_8_1_MSVC2022_64bit-Debug true @@ -139,8 +139,8 @@ 2 - C:\Users\njohnson\Projects\FastFile_WaW\build\Desktop_Qt_6_8_1_MSVC2022_64bit-Release - C:/Users/njohnson/Projects/FastFile_WaW/build/Desktop_Qt_6_8_1_MSVC2022_64bit-Release + C:\Users\njohnson\Projects\XPlor\build\Desktop_Qt_6_8_1_MSVC2022_64bit-Release + C:/Users/njohnson/Projects/XPlor/build/Desktop_Qt_6_8_1_MSVC2022_64bit-Release true @@ -180,8 +180,8 @@ 0 - C:\Users\njohnson\Projects\FastFile_WaW\build\Desktop_Qt_6_8_1_MSVC2022_64bit-Profile - C:/Users/njohnson/Projects/FastFile_WaW/build/Desktop_Qt_6_8_1_MSVC2022_64bit-Profile + C:\Users\njohnson\Projects\XPlor\build\Desktop_Qt_6_8_1_MSVC2022_64bit-Profile + C:/Users/njohnson/Projects/XPlor/build/Desktop_Qt_6_8_1_MSVC2022_64bit-Profile true @@ -245,13 +245,11 @@ false -e cpu-cycles --call-graph "dwarf,4096" -F 250 - Qt4ProjectManager.Qt4RunConfiguration: - C:/Users/njohnson/Projects/FastFile_WaW/FastFile_WaW.pro + ProjectExplorer.CustomExecutableRunConfiguration + false true - true true - C:/Users/njohnson/Projects/FastFile_WaW/build/Desktop_Qt_6_8_1_MSVC2022_64bit-Release 1 From 08eb6f57b8e62da4963ce633d53a8b0ea1e120f3 Mon Sep 17 00:00:00 2001 From: = Date: Sat, 11 Jan 2025 10:29:21 -0500 Subject: [PATCH 4/4] Add user file to .gitignore. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 297c54a..6700e2b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /build/ /data/dlls/ /data/fastfiles/ +.pro.user