Skip to content

Commit ea81565

Browse files
authored
Merge pull request #8 from broken-bytes/dev
Added Qt6
2 parents 9f12cb4 + ae5d788 commit ea81565

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+251
-12668
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,6 @@ lib
1515
out
1616
build
1717
.vs
18+
projects
19+
external
20+
*.ninja

Build.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
cmake -G "Visual Studio 16 2019" -B "projects/Visual Studio 2019" -S ./
2+
cmake --build "projects/Visual Studio 2019" --config Debug

CMakeLists.txt

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,53 +3,56 @@ set(CMAKE_CXX_STANDARD 17)
33
set(CMAKE_CXX_STANDARD_REQUIRED ON)
44

55
set(APP DualSense4Windows)
6+
set(QT E:/libs/Qt/6.0.2/6.0.2/msvc2019_64)
67
set(ASSET_PACKER AssetPacker)
78
project(${APP})
89

910

1011
set(CMAKE_SUPPRESS_REGENERATION true)
1112
set(SRC_INC
1213
include/Core.hxx
13-
include/ControllerKit.hxx
14+
include/DualSense4Windows.hxx
1415
include/DualSense.hxx
1516
include/Math.hxx
1617
include/Utils.hxx
17-
include/App.hxx
1818
include/Interface.hxx
1919
include/Types.hxx
2020
include/Window.hxx
2121
include/MainWindow.hxx
2222
include/ColorPicker.hxx
2323
include/DualSenseInfo.hxx
24+
include/DualSenseList.hxx
25+
include/DualSenseEntryWidget.hxx
2426
)
2527

2628
set(SRC
27-
src/ControllerKit.cxx
29+
src/DualSense4Windows.cxx
2830
src/DualSense.cxx
2931
src/Utils.cxx
30-
src/App.cxx
3132
src/Interface.cxx
3233
src/MainWindow.cxx
3334
src/ColorPicker.cxx
35+
src/DualSenseList.cxx
36+
src/DualSenseEntryWidget.cxx
3437
DualSense4Windows.exe.manifest
3538
DeclareDPIAware.manifest
3639
)
3740

3841
set(ASSETS "$<TARGET_FILE_DIR:${APP}>/assets")
3942

40-
#add_executable(AssetPacker include/Base64.hxx src/Base64.cxx src/AssetPacker.cxx)
41-
#target_include_directories(${ASSET_PACKER} PUBLIC external/gumbo)
42-
#target_link_directories(${ASSET_PACKER} PUBLIC lib/)
43-
#target_link_libraries(${ASSET_PACKER} gumbo.lib)
44-
4543

4644
add_executable(${APP} WIN32 ${SRC} ${SRC_INC})
4745
target_link_directories(${APP} PUBLIC lib/)
46+
target_link_directories(${APP} PUBLIC ${QT}/lib)
4847
target_link_libraries(${APP} comctl32.lib)
4948
target_link_libraries(${APP} hidapi.lib)
50-
target_link_libraries(${APP} setupapi)
49+
target_link_libraries(${APP} setupapi.lib)
5150
target_link_libraries(${APP} ViGEmClient.lib)
51+
target_link_libraries(${APP} Qt6Core.lib)
52+
target_link_libraries(${APP} Qt6GUI.lib)
53+
target_link_libraries(${APP} Qt6Widgets.lib)
5254
target_include_directories(${APP} PUBLIC external/)
55+
target_include_directories(${APP} PUBLIC ${QT}/include)
5356
target_include_directories(${APP} PRIVATE include/)
5457

5558

CreateVisualSudioSolution.bat

Lines changed: 0 additions & 3 deletions
This file was deleted.

external/AppCore/App.h

Lines changed: 0 additions & 182 deletions
This file was deleted.

external/AppCore/AppCore.h

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)