Merge branch 'master' into TheElixZammuto

This commit is contained in:
loki 2021-04-24 13:09:14 +02:00
commit a613280bbd

View File

@ -70,6 +70,7 @@ if(WIN32)
ViGEmClient/include/ViGEm/Util.h ViGEmClient/include/ViGEm/Util.h
ViGEmClient/include/ViGEm/km/BusShared.h) ViGEmClient/include/ViGEm/km/BusShared.h)
list(PREPEND PLATFORM_LIBRARIES list(PREPEND PLATFORM_LIBRARIES
ssp
winmm winmm
ksuser ksuser
wsock32 wsock32