mirror of
https://github.com/open-goal/jak-project
synced 2026-05-26 07:39:12 -04:00
Tyler Wilding
1f6438e517
This PR updates to SDL3, and with it, adds a handful of new features. Everything seems to work but I'm going to look over the code once last time before merging, some of the API changes are hard to spot. Fixes #2773 ### Pressure sensitivity support for DS3 Controllers SDL3 adds pressure sensitivity support for DS3 controllers on windows. I have not tested on linux. The option is disabled by default. On windows you will need https://docs.nefarius.at/projects/DsHidMini/ and to be using SXS mode. ### DualSense and Xbox One Trigger Effects If enabled, Jak 2 will have certain trigger effects. They are: - xbox1: - small vibrate when collecting dark eco - big vibrate when changing to dark jak - vibrate when shooting gun, proportional to gun type - ps5: - resistance when changing to dark jak - different gun shooting effects - red (resistance) - yellow (weapon trigger) - blue (vibrates) - purple (less resistance) > **Gun Shooting effects are only enabled if the new "Swap R1 and R2" option is enabled** There are more effects that could be used in `dualsense_effects.cpp`, but I only exposed the ones I needed to OpenGOAL. If a modder wants to use some of the others and wires them up end-to-end, please consider contributing that upstream. ### New ImGUI Menu Added new imgui options for selecting the active controller, for those people that struggle to select the initial controller.  ### Testing The highlights of what I tested successfully: - display - [x] all mode switch permutations - [x] launch with all modes saved - [x] switch monitors / unplug monitor that was active, how does it handle it - [x] load with alternate monitor saved and all modes - [x] allowing hidpi doesnt break macos - controls - [x] keyboard and mouse still work - [x] pressure sensitivity on linux
162 lines
4.9 KiB
Makefile
Vendored
Generated
162 lines
4.9 KiB
Makefile
Vendored
Generated
LOCAL_PATH := $(call my-dir)
|
|
|
|
###########################
|
|
#
|
|
# SDL shared library
|
|
#
|
|
###########################
|
|
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_MODULE := SDL3
|
|
|
|
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include $(LOCAL_PATH)/include/build_config $(LOCAL_PATH)/src
|
|
|
|
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
|
|
|
|
LOCAL_SRC_FILES := \
|
|
$(subst $(LOCAL_PATH)/,, \
|
|
$(wildcard $(LOCAL_PATH)/src/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/audio/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/audio/android/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/audio/dummy/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/audio/aaudio/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/audio/openslES/*.c) \
|
|
$(LOCAL_PATH)/src/atomic/SDL_atomic.c.arm \
|
|
$(LOCAL_PATH)/src/atomic/SDL_spinlock.c.arm \
|
|
$(wildcard $(LOCAL_PATH)/src/camera/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/camera/android/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/camera/dummy/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/core/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/core/android/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/cpuinfo/*.c) \
|
|
$(LOCAL_PATH)/src/dialog/SDL_dialog.c \
|
|
$(LOCAL_PATH)/src/dialog/SDL_dialog_utils.c \
|
|
$(LOCAL_PATH)/src/dialog/android/SDL_androiddialog.c \
|
|
$(wildcard $(LOCAL_PATH)/src/dynapi/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/events/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/io/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/io/generic/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/gpu/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/gpu/vulkan/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/haptic/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/haptic/android/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/haptic/dummy/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/hidapi/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/hidapi/android/*.cpp) \
|
|
$(wildcard $(LOCAL_PATH)/src/joystick/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/joystick/android/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/joystick/dummy/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/joystick/hidapi/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/joystick/steam/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/joystick/virtual/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/loadso/dlopen/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/locale/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/locale/android/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/main/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/main/generic/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/misc/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/misc/android/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/power/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/power/android/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/process/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/process/dummy/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/filesystem/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/filesystem/android/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/filesystem/posix/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/sensor/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/sensor/android/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/sensor/dummy/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/render/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/render/*/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/stdlib/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/storage/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/storage/generic/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/thread/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/thread/pthread/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/time/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/time/unix/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/timer/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/timer/unix/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/tray/dummy/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/tray/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/video/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/video/android/*.c) \
|
|
$(wildcard $(LOCAL_PATH)/src/video/yuv2rgb/*.c))
|
|
|
|
LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES
|
|
LOCAL_CFLAGS += \
|
|
-Wall -Wextra \
|
|
-Wmissing-prototypes \
|
|
-Wunreachable-code-break \
|
|
-Wunneeded-internal-declaration \
|
|
-Wmissing-variable-declarations \
|
|
-Wfloat-conversion \
|
|
-Wshorten-64-to-32 \
|
|
-Wunreachable-code-return \
|
|
-Wshift-sign-overflow \
|
|
-Wstrict-prototypes \
|
|
-Wkeyword-macro \
|
|
|
|
# Warnings we haven't fixed (yet)
|
|
LOCAL_CFLAGS += -Wno-unused-parameter -Wno-sign-compare
|
|
|
|
LOCAL_CXXFLAGS += -std=gnu++11
|
|
|
|
LOCAL_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -lOpenSLES -llog -landroid
|
|
|
|
LOCAL_LDFLAGS := -Wl,--no-undefined -Wl,--no-undefined-version -Wl,--version-script=$(LOCAL_PATH)/src/dynapi/SDL_dynapi.sym
|
|
|
|
ifeq ($(NDK_DEBUG),1)
|
|
cmd-strip :=
|
|
endif
|
|
|
|
LOCAL_STATIC_LIBRARIES := cpufeatures
|
|
|
|
include $(BUILD_SHARED_LIBRARY)
|
|
|
|
|
|
###########################
|
|
#
|
|
# SDL_test static library
|
|
#
|
|
###########################
|
|
|
|
LOCAL_MODULE := SDL3_test
|
|
|
|
LOCAL_MODULE_FILENAME := libSDL3_test
|
|
|
|
LOCAL_SRC_FILES := \
|
|
$(subst $(LOCAL_PATH)/,, \
|
|
$(wildcard $(LOCAL_PATH)/src/test/*.c))
|
|
|
|
LOCAL_LDLIBS :=
|
|
|
|
LOCAL_LDFLAGS :=
|
|
|
|
LOCAL_EXPORT_LDLIBS :=
|
|
|
|
include $(BUILD_STATIC_LIBRARY)
|
|
|
|
|
|
###########################
|
|
#
|
|
# SDL static library
|
|
#
|
|
###########################
|
|
|
|
LOCAL_MODULE := SDL3_static
|
|
|
|
LOCAL_MODULE_FILENAME := libSDL3
|
|
|
|
LOCAL_LDLIBS :=
|
|
|
|
LOCAL_LDFLAGS :=
|
|
|
|
LOCAL_EXPORT_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -llog -landroid
|
|
|
|
include $(BUILD_STATIC_LIBRARY)
|
|
|
|
$(call import-module,android/cpufeatures)
|
|
|