Merge 08a41a90eb into 6309a9c6a7

libretro: So apparently, _XOPEN_SOURCE has to be at the top of the file. Hopefully this makes both GCC14 users and Mac users happy. (Related to commit 779606e. Based on PR #793.)
libretro: Fix building on Mach-based operating systems, otherwise known as Mac OS X and modern macOS (regression from commit 90d0abd). Based on PR #793 .
2024-07-03 00:08:51 +00:00 · 2024-06-11 16:16:42 +03:00 · 2024-06-07 17:16:53 -07:00 · 2024-06-07 16:33:13 -07:00 · 2024-06-07 00:24:55 -04:00 · 2024-06-07 00:18:09 -04:00
2 changed files with 14 additions and 4 deletions
--- a/desmume/src/frontend/windows/inputdx.cpp
+++ b/desmume/src/frontend/windows/inputdx.cpp
@ -51,6 +51,13 @@
 #include "main.h"
 #include "winutil.h"

+	//60 is a poor choice for a threshold; the theoretical maximum you can get even at an exact 45 degree angle is 70
+	//Sloshy sticks or slightly-off angles make it impossible to reach 60, as it's far too close to 70.
+	//Too-small values feel bad, too
+	//50 is a more normal choice
+	//#define S9X_JOY_NEUTRAL 60
+int S9X_JOY_NEUTRAL = 50;
+
 // Gamepad Dialog Strings
 // Support Unicode display
 //#define INPUTCONFIG_TITLE "Input Configuration"
@ -520,6 +527,9 @@ BOOL di_init()
 {
 	HWND hParentWnd = MainWindow->getHWnd();

+	S9X_JOY_NEUTRAL = GetPrivateProfileInt("Controls", "DigitalizationThreshold", S9X_JOY_NEUTRAL, IniName);
+	
+
 	pDI = NULL;
 	memset(cDIBuf, 0, sizeof(cDIBuf));

@ -669,10 +679,6 @@ int FunkyNormalize(int cur, int min, int max)
    return Result;
 }

-
-
-#define S9X_JOY_NEUTRAL 60
-
 void CheckAxis (short joy, short control, int val,
                                       int min, int max,
                                       bool &first, bool &second)
--- a/desmume/src/libretro-common/file/file_path.c
+++ b/desmume/src/libretro-common/file/file_path.c
@ -20,7 +20,11 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */

+#ifdef __MACH__
+#define _DARWIN_C_SOURCE    /* As below, plus strl* functions */
+#else
 #define _XOPEN_SOURCE 500   /* For strdup, realpath */
+#endif

 #include <stdlib.h>
 #include <boolean.h>
Author	SHA1	Message	Date
Marc Aldorasi	7302572c6a	Merge `08a41a90eb` into `6309a9c6a7`	2024-06-11 16:16:42 +03:00
rogerman	6309a9c6a7	libretro: So apparently, _XOPEN_SOURCE has to be at the top of the file. Hopefully this makes both GCC14 users and Mac users happy. (Related to commit `779606e`. Based on PR #793.)	2024-06-07 17:16:53 -07:00
rogerman	779606ec2f	libretro: Fix building on Mach-based operating systems, otherwise known as Mac OS X and modern macOS (regression from commit `90d0abd`). Based on PR #793 .	2024-06-07 16:33:13 -07:00
zeromus	ffb8666a8f	winport - plumb S9X_JOY_NEUTRAL through inifile: [Controls] DigitalizationThreshold=50	2024-06-07 00:24:55 -04:00
zeromus	ff6c33a8d6	winport - reduce joystick digitalization threshold from 60% to a more normal 50%. With a too-high threshold, it's impossible to specify diagonals. This is preferable for games without diagonals (else you accidentally crouch when you just meant to walk to the side) instead of 8-way games, so we have to be pretty aggressive about the threshold. But 50 is the more normal choice.	2024-06-07 00:18:09 -04:00