macos fixes

project-valhalla · Mar 8, 2024 · dbb75e9 · dbb75e9
1 parent 80a97ac
commit dbb75e9
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 6 deletions.
diff --git a/...ntents/Frameworks/SDL2.framework/Versions/A/Frameworks/hidapi.framework/Versions/A/hidapi b/...ntents/Frameworks/SDL2.framework/Versions/A/Frameworks/hidapi.framework/Versions/A/hidapi
diff --git a/bin/valhalla.app/Contents/Frameworks/SDL2.framework/Versions/A/SDL2 b/bin/valhalla.app/Contents/Frameworks/SDL2.framework/Versions/A/SDL2
diff --git a/bin/valhalla.app/Contents/Frameworks/SDL2_image.framework/Headers b/bin/valhalla.app/Contents/Frameworks/SDL2_image.framework/Headers
@@ -1 +1 @@
-Versions/Current/Headers/
+Versions/A/Headers
diff --git a/bin/valhalla.app/Contents/Frameworks/SDL2_image.framework/Resources b/bin/valhalla.app/Contents/Frameworks/SDL2_image.framework/Resources
@@ -1 +1 @@
-Versions/Current/Resources/
+Versions/A/Resources
diff --git a/bin/valhalla.app/Contents/Frameworks/SDL2_image.framework/SDL2_image b/bin/valhalla.app/Contents/Frameworks/SDL2_image.framework/SDL2_image
@@ -1 +1 @@
-Versions/Current/SDL2_image
+Versions/A/SDL2_image
diff --git a/bin/valhalla.app/Contents/Frameworks/SDL2_mixer.framework/Headers b/bin/valhalla.app/Contents/Frameworks/SDL2_mixer.framework/Headers
@@ -1 +1 @@
-Versions/Current/Headers
+Versions/A/Headers/
diff --git a/bin/valhalla.app/Contents/Frameworks/SDL2_mixer.framework/Resources b/bin/valhalla.app/Contents/Frameworks/SDL2_mixer.framework/Resources
@@ -1 +1 @@
-Versions/Current/Resources
+Versions/A/Resources
diff --git a/bin/valhalla.app/Contents/Frameworks/SDL2_mixer.framework/SDL2_mixer b/bin/valhalla.app/Contents/Frameworks/SDL2_mixer.framework/SDL2_mixer
@@ -1 +1 @@
-Versions/Current/SDL2_mixer
+Versions/A/SDL2_mixer
diff --git a/...ramework/Versions/A/Frameworks/modplug.framework/Versions/A/Resources/LICENSE.modplug.txt b/...ramework/Versions/A/Frameworks/modplug.framework/Versions/A/Resources/LICENSE.modplug.txt
@@ -0,0 +1 @@
+ModPlug-XMMS and libmodplug are now in the public domain.
diff --git a/source/enet/Makefile b/source/enet/Makefile
@@ -1,6 +1,13 @@
 CFLAGS=-O3 -fomit-frame-pointer
 override CFLAGS:= $(CFLAGS) -Iinclude $(shell ./check_cflags.sh $(CC) $(CFLAGS))
 
+PLATFORM= $(shell uname -s | tr '[:lower:]' '[:upper:]')
+
+ifneq (,$(findstring DARWIN,$(PLATFORM)))
+OSXMIN= 10.9
+override CFLAGS:= -arch x86_64 -mmacosx-version-min=$(OSXMIN) $(CFLAGS)
+endif
+
 OBJS= \
 	callbacks.o \
 	compress.o \