Skip to content

Commit bedbc88

Browse files
shuang886shuang886
committed
use SDL frameworks instead of Homebrew libraries
1 parent 39aabc9 commit bedbc88

File tree

6 files changed

+36
-26
lines changed

6 files changed

+36
-26
lines changed

‎BlockOut.xcodeproj/project.pbxproj‎

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,15 @@
9999
B04364382B125AEC002AB585 /* zlib.h in Headers */ = {isa = PBXBuildFile; fileRef = B04364212B125AEC002AB585 /* zlib.h */; };
100100
B043643C2B125B0E002AB585 /* libImageLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B04363C22B1259FE002AB585 /* libImageLib.a */; };
101101
B043643E2B125D38002AB585 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B043643D2B125D38002AB585 /* OpenGL.framework */; };
102-
B04364402B125D68002AB585 /* libSDL2_mixer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B043643F2B125D68002AB585 /* libSDL2_mixer.a */; };
103-
B04364422B125E08002AB585 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B04364412B125E08002AB585 /* libSDL2.a */; };
104102
B04364442B125E4D002AB585 /* libpthread.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = B04364432B125E4D002AB585 /* libpthread.tbd */; };
105103
B04364462B125E55002AB585 /* libm.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = B04364452B125E55002AB585 /* libm.tbd */; };
106104
B04364482B125E59002AB585 /* libdl.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = B04364472B125E59002AB585 /* libdl.tbd */; };
107105
B043644A2B1260A9002AB585 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B04364492B1260A9002AB585 /* CoreFoundation.framework */; };
108106
B043644C2B1267A4002AB585 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = B043644B2B1267A4002AB585 /* Credits.rtf */; };
107+
B04364672B12E671002AB585 /* SDL2_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B04364642B12E66C002AB585 /* SDL2_mixer.framework */; };
108+
B04364682B12E671002AB585 /* SDL2_mixer.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B04364642B12E66C002AB585 /* SDL2_mixer.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
109+
B04364692B12E673002AB585 /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B04364632B12E66C002AB585 /* SDL2.framework */; };
110+
B043646A2B12E673002AB585 /* SDL2.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B04364632B12E66C002AB585 /* SDL2.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
109111
/* End PBXBuildFile section */
110112

111113
/* Begin PBXContainerItemProxy section */
@@ -118,6 +120,21 @@
118120
};
119121
/* End PBXContainerItemProxy section */
120122

123+
/* Begin PBXCopyFilesBuildPhase section */
124+
B04364602B12E611002AB585 /* Embed Frameworks */ = {
125+
isa = PBXCopyFilesBuildPhase;
126+
buildActionMask = 2147483647;
127+
dstPath = "";
128+
dstSubfolderSpec = 10;
129+
files = (
130+
B04364682B12E671002AB585 /* SDL2_mixer.framework in Embed Frameworks */,
131+
B043646A2B12E673002AB585 /* SDL2.framework in Embed Frameworks */,
132+
);
133+
name = "Embed Frameworks";
134+
runOnlyForDeploymentPostprocessing = 0;
135+
};
136+
/* End PBXCopyFilesBuildPhase section */
137+
121138
/* Begin PBXFileReference section */
122139
B043633B2B125664002AB585 /* BlockOut.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BlockOut.app; sourceTree = BUILT_PRODUCTS_DIR; };
123140
B04363412B125665002AB585 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -241,6 +258,8 @@
241258
B04364472B125E59002AB585 /* libdl.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libdl.tbd; path = usr/lib/libdl.tbd; sourceTree = SDKROOT; };
242259
B04364492B1260A9002AB585 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
243260
B043644B2B1267A4002AB585 /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Credits.rtf; path = BlockOut/Credits.rtf; sourceTree = "<group>"; };
261+
B04364632B12E66C002AB585 /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = ../Frameworks/SDL2.framework; sourceTree = "<group>"; };
262+
B04364642B12E66C002AB585 /* SDL2_mixer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2_mixer.framework; path = ../Frameworks/SDL2_mixer.framework; sourceTree = "<group>"; };
244263
/* End PBXFileReference section */
245264

246265
/* Begin PBXFrameworksBuildPhase section */
@@ -249,13 +268,13 @@
249268
buildActionMask = 2147483647;
250269
files = (
251270
B043643C2B125B0E002AB585 /* libImageLib.a in Frameworks */,
252-
B04364422B125E08002AB585 /* libSDL2.a in Frameworks */,
253-
B04364402B125D68002AB585 /* libSDL2_mixer.a in Frameworks */,
271+
B04364672B12E671002AB585 /* SDL2_mixer.framework in Frameworks */,
254272
B043643E2B125D38002AB585 /* OpenGL.framework in Frameworks */,
255273
B043644A2B1260A9002AB585 /* CoreFoundation.framework in Frameworks */,
256274
B04364482B125E59002AB585 /* libdl.tbd in Frameworks */,
257275
B04364462B125E55002AB585 /* libm.tbd in Frameworks */,
258276
B04364442B125E4D002AB585 /* libpthread.tbd in Frameworks */,
277+
B04364692B12E673002AB585 /* SDL2.framework in Frameworks */,
259278
);
260279
runOnlyForDeploymentPostprocessing = 0;
261280
};
@@ -272,6 +291,8 @@
272291
B04363322B125664002AB585 = {
273292
isa = PBXGroup;
274293
children = (
294+
B04364642B12E66C002AB585 /* SDL2_mixer.framework */,
295+
B04364632B12E66C002AB585 /* SDL2.framework */,
275296
B043633D2B125664002AB585 /* BlockOut */,
276297
B04363BA2B125967002AB585 /* ImageLib */,
277298
B043633C2B125664002AB585 /* Products */,
@@ -524,6 +545,7 @@
524545
B04363372B125664002AB585 /* Sources */,
525546
B04363382B125664002AB585 /* Frameworks */,
526547
B04363392B125664002AB585 /* Resources */,
548+
B04364602B12E611002AB585 /* Embed Frameworks */,
527549
);
528550
buildRules = (
529551
);
@@ -823,6 +845,7 @@
823845
CODE_SIGN_STYLE = Automatic;
824846
COMBINE_HIDPI_IMAGES = YES;
825847
CURRENT_PROJECT_VERSION = 1;
848+
FRAMEWORK_SEARCH_PATHS = ../Frameworks;
826849
GCC_PREPROCESSOR_DEFINITIONS = (
827850
_DEBUG,
828851
"DEBUG=1",
@@ -831,21 +854,14 @@
831854
"$(inherited)",
832855
);
833856
GENERATE_INFOPLIST_FILE = YES;
834-
HEADER_SEARCH_PATHS = (
835-
/opt/homebrew/include/SDL2,
836-
/usr/local/include/SDL2,
837-
);
838857
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.arcade-games";
839858
INFOPLIST_KEY_NSHumanReadableCopyright = "";
840859
INFOPLIST_KEY_NSPrincipalClass = NSApplication;
841860
LD_RUNPATH_SEARCH_PATHS = (
842861
"$(inherited)",
843862
"@executable_path/../Frameworks",
844863
);
845-
LIBRARY_SEARCH_PATHS = (
846-
/opt/homebrew/lib,
847-
/usr/local/lib,
848-
);
864+
LIBRARY_SEARCH_PATHS = "";
849865
MARKETING_VERSION = 1.0;
850866
PRODUCT_BUNDLE_IDENTIFIER = com.tampinco.BlockOut;
851867
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -862,26 +878,20 @@
862878
CODE_SIGN_STYLE = Automatic;
863879
COMBINE_HIDPI_IMAGES = YES;
864880
CURRENT_PROJECT_VERSION = 1;
881+
FRAMEWORK_SEARCH_PATHS = ../Frameworks;
865882
GCC_PREPROCESSOR_DEFINITIONS = (
866883
linux,
867884
MACOS_BUNDLE,
868885
);
869886
GENERATE_INFOPLIST_FILE = YES;
870-
HEADER_SEARCH_PATHS = (
871-
/opt/homebrew/include/SDL2,
872-
/usr/local/include/SDL2,
873-
);
874887
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.arcade-games";
875888
INFOPLIST_KEY_NSHumanReadableCopyright = "";
876889
INFOPLIST_KEY_NSPrincipalClass = NSApplication;
877890
LD_RUNPATH_SEARCH_PATHS = (
878891
"$(inherited)",
879892
"@executable_path/../Frameworks",
880893
);
881-
LIBRARY_SEARCH_PATHS = (
882-
/opt/homebrew/lib,
883-
/usr/local/lib,
884-
);
894+
LIBRARY_SEARCH_PATHS = "";
885895
MARKETING_VERSION = 1.0;
886896
PRODUCT_BUNDLE_IDENTIFIER = com.tampinco.BlockOut;
887897
PRODUCT_NAME = "$(TARGET_NAME)";

‎BlockOut/GLApp/GLApp.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// SDL/OpenGL OpenGL application framework
33
// Jean-Luc PONS (2007)
44
// -------------------------------------------
5-
#include <SDL.h>
6-
#include <SDL_opengl.h>
5+
#include <SDL2/SDL.h>
6+
#include <SDL2/SDL_opengl.h>
77
#include <string.h>
88
#include <stdlib.h>
99

‎BlockOut/GLApp/GLFont.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// -----------------------------------------------
22
// Simple 2D font
33
// -----------------------------------------------
4-
#include "SDL_opengl.h"
4+
#include <SDL2/SDL_opengl.h>
55

66
#ifndef _GLFONT2DH_
77
#define _GLFONT2DH_

‎BlockOut/GLApp/GLMatrix.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// -------------------------------------
22
// 3x3 Matrix class
33
// -------------------------------------
4-
#include <SDL_opengl.h>
4+
#include <SDL2/SDL_opengl.h>
55

66
#ifndef _GLMATRIXH_
77
#define _GLMATRIXH_

‎BlockOut/GLApp/GLSprite.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// -----------------------------------------------
22
// 2D sprites
33
// -----------------------------------------------
4-
#include "SDL_opengl.h"
4+
#include <SDL2/SDL_opengl.h>
55

66
#ifndef _SPRITE2DH_
77
#define _SPRITE2DH_

‎BlockOut/SoundManager.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
GNU General Public License for more details.
1616
*/
1717
#include "GLApp/GLApp.h"
18-
#include <SDL_mixer.h>
18+
#include <SDL2_mixer/SDL_mixer.h>
1919

2020
#ifndef SOUNDMANAGERH
2121
#define SOUNDMANAGERH

0 commit comments

Comments
 (0)