forked from schismtracker/schismtracker
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'schismtracker:master' into master
- Loading branch information
Showing
265 changed files
with
36,933 additions
and
17,131 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
diff -ruN panther_sdl2-20210624-orig/src/video/cocoa/SDL_cocoakeyboard.m panther_sdl2-20210624/src/video/cocoa/SDL_cocoakeyboard.m | ||
--- panther_sdl2-20210624-orig/src/video/cocoa/SDL_cocoakeyboard.m 2021-06-25 00:00:38.000000000 -0400 | ||
+++ panther_sdl2-20210624/src/video/cocoa/SDL_cocoakeyboard.m 2024-10-31 13:26:28.563041678 -0400 | ||
@@ -426,7 +426,7 @@ | ||
static void | ||
UpdateKeymap(SDL_VideoData *data) | ||
{ | ||
-#if defined(MAC_OS_X_VERSION_10_5) | ||
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 | ||
TISInputSourceRef key_layout; | ||
const void *chr_data; | ||
int i; | ||
diff -ruN panther_sdl2-20210624-orig/src/video/cocoa/SDL_cocoamouse.h panther_sdl2-20210624/src/video/cocoa/SDL_cocoamouse.h | ||
--- panther_sdl2-20210624-orig/src/video/cocoa/SDL_cocoamouse.h 2021-06-25 00:00:38.000000000 -0400 | ||
+++ panther_sdl2-20210624/src/video/cocoa/SDL_cocoamouse.h 2024-10-31 13:25:29.762259094 -0400 | ||
@@ -25,7 +25,7 @@ | ||
|
||
#include "SDL_cocoavideo.h" | ||
|
||
-#if !defined(MAC_OS_X_VERSION_10_5) | ||
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 | ||
typedef float CGFloat; | ||
#endif | ||
|
||
diff -ruN panther_sdl2-20210624-orig/src/video/cocoa/SDL_cocoavideo.h panther_sdl2-20210624/src/video/cocoa/SDL_cocoavideo.h | ||
--- panther_sdl2-20210624-orig/src/video/cocoa/SDL_cocoavideo.h 2021-06-25 00:00:38.000000000 -0400 | ||
+++ panther_sdl2-20210624/src/video/cocoa/SDL_cocoavideo.h 2024-10-31 13:25:27.498537161 -0400 | ||
@@ -45,7 +45,7 @@ | ||
#include "SDL_cocoaopengl.h" | ||
#include "SDL_cocoawindow.h" | ||
|
||
-#if !defined(MAC_OS_X_VERSION_10_5) | ||
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 | ||
typedef long int NSInteger; | ||
typedef unsigned int NSUInteger; | ||
#endif | ||
diff -ruN panther_sdl2-20210624-orig/src/video/cocoa/SDL_cocoawindow.m panther_sdl2-20210624/src/video/cocoa/SDL_cocoawindow.m | ||
--- panther_sdl2-20210624-orig/src/video/cocoa/SDL_cocoawindow.m 2021-06-25 00:00:38.000000000 -0400 | ||
+++ panther_sdl2-20210624/src/video/cocoa/SDL_cocoawindow.m 2024-10-31 13:29:26.959250907 -0400 | ||
@@ -102,7 +102,7 @@ | ||
NSOpenGLContext *currentContext = [NSOpenGLContext currentContext]; | ||
NSMutableArray *contexts = data->nscontexts; | ||
@synchronized (contexts) { | ||
-#if defined(MAC_OS_X_VERSION_10_5) | ||
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 | ||
for (SDLOpenGLContext *context in contexts) { | ||
#else | ||
/* old way to iterate */ | ||
@@ -363,7 +363,7 @@ | ||
!!! FIXME: http://bugzilla.libsdl.org/show_bug.cgi?id=1825 | ||
*/ | ||
windows = [NSApp orderedWindows]; | ||
-#if defined(MAC_OS_X_VERSION_10_5) | ||
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 | ||
for (NSWindow *win in windows) { | ||
#else | ||
/* old way to iterate */ | ||
@@ -1521,7 +1521,7 @@ | ||
} | ||
|
||
NSArray *contexts = [[data->nscontexts copy] autorelease]; | ||
-#if defined(MAC_OS_X_VERSION_10_5) | ||
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 | ||
for (SDLOpenGLContext *context in contexts) { | ||
#else | ||
/* old way to iterate */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- a/CMakeLists.txt 2024-10-06 21:59:24.343387636 -0400 | ||
+++ b/CMakeLists.txt 2024-10-06 13:24:51.887538244 -0400 | ||
@@ -48,7 +48,7 @@ | ||
endif () | ||
|
||
set_target_properties (utf8proc PROPERTIES | ||
- POSITION_INDEPENDENT_CODE ON | ||
+ POSITION_INDEPENDENT_CODE OFF | ||
VERSION "${SO_MAJOR}.${SO_MINOR}.${SO_PATCH}" | ||
SOVERSION ${SO_MAJOR} | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
From d526df02f56c767ec6b0248fd5593573c36ba4da Mon Sep 17 00:00:00 2001 | ||
From: Paper <[email protected]> | ||
Date: Sun, 20 Oct 2024 19:50:25 -0400 | ||
Subject: [PATCH] makefile: fix target directory | ||
|
||
--- | ||
Makefile | 4 ++-- | ||
1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/Makefile b/Makefile | ||
index 806f441..e3924d7 100644 | ||
--- a/Makefile | ||
+++ b/Makefile | ||
@@ -11,7 +11,7 @@ PERL=perl | ||
CFLAGS ?= -O2 | ||
PICFLAG = -fPIC | ||
C99FLAG = -std=c99 | ||
-WCFLAGS = -Wsign-conversion -Wall -Wextra -pedantic | ||
+WCFLAGS = -Wall -Wextra -pedantic | ||
UCFLAGS = $(CPPFLAGS) $(CFLAGS) $(PICFLAG) $(C99FLAG) $(WCFLAGS) -DUTF8PROC_EXPORTS $(UTF8PROC_DEFINES) | ||
LDFLAG_SHARED = -shared | ||
SOFLAG = -Wl,-soname | ||
@@ -39,7 +39,7 @@ else # GNU/Linux, at least (Windows should probably use cmake) | ||
endif | ||
|
||
# installation directories (for 'make install') | ||
-prefix=/usr/local | ||
+prefix=$(HOME)/ppcprefix | ||
libdir=$(prefix)/lib | ||
includedir=$(prefix)/include | ||
pkgconfigdir=$(libdir)/pkgconfig | ||
-- | ||
2.39.2 | ||
|
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.