Skip to content

Commit 2a22314

Browse files
committed
fix SDL2 framework link
1 parent c88db12 commit 2a22314

File tree

3 files changed

+11
-39
lines changed

3 files changed

+11
-39
lines changed

src/libprojectM/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ ELSE (USE_FTGL)
190190
ENDIF(FTGL_FOUND)
191191

192192
# todo: change this because its obscure and probably not being used
193-
set (FTGL_INCLUDE_DIRS "/opt/local/include")
193+
set (FTGL_INCLUDE_DIRS "/usr/local/include")
194194
set (FTGL_LINK_DIRS )
195195
set (FTGL_LINK_TARGETS )
196196
ENDIF(USE_FTGL)

src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
C307DFD41D565B57002F6B9E /* presets in CopyFiles */ = {isa = PBXBuildFile; fileRef = C307DFD31D565B57002F6B9E /* presets */; };
1111
C345214F1BF022A5001707D2 /* projectM_SDL_main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C345214E1BF022A5001707D2 /* projectM_SDL_main.cpp */; };
1212
C34521511BF022B1001707D2 /* libprojectM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34521501BF022B1001707D2 /* libprojectM.a */; };
13-
C34521531BF022ED001707D2 /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C34521521BF022ED001707D2 /* SDL2.framework */; };
1413
C34521571BF0250D001707D2 /* libMilkdropPresetFactory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34521561BF0250D001707D2 /* libMilkdropPresetFactory.a */; };
1514
C34521591BF02516001707D2 /* libNativePresetFactory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34521581BF02516001707D2 /* libNativePresetFactory.a */; };
1615
C345215A1BF0259C001707D2 /* libRenderer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34521541BF02333001707D2 /* libRenderer.a */; };
@@ -44,7 +43,6 @@
4443
C34521441BF02294001707D2 /* SDLprojectM */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = SDLprojectM; sourceTree = BUILT_PRODUCTS_DIR; };
4544
C345214E1BF022A5001707D2 /* projectM_SDL_main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = projectM_SDL_main.cpp; sourceTree = SOURCE_ROOT; };
4645
C34521501BF022B1001707D2 /* libprojectM.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libprojectM.a; sourceTree = "<group>"; };
47-
C34521521BF022ED001707D2 /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = ../../../../../../Library/Frameworks/SDL2.framework; sourceTree = "<group>"; };
4846
C34521541BF02333001707D2 /* libRenderer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libRenderer.a; path = ../libprojectM/Renderer/libRenderer.a; sourceTree = "<group>"; };
4947
C34521561BF0250D001707D2 /* libMilkdropPresetFactory.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libMilkdropPresetFactory.a; path = ../libprojectM/MilkdropPresetFactory/libMilkdropPresetFactory.a; sourceTree = "<group>"; };
5048
C34521581BF02516001707D2 /* libNativePresetFactory.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libNativePresetFactory.a; path = ../libprojectM/NativePresetFactory/libNativePresetFactory.a; sourceTree = "<group>"; };
@@ -74,7 +72,6 @@
7472
C345215C1BF025A9001707D2 /* OpenGL.framework in Frameworks */,
7573
C345215A1BF0259C001707D2 /* libRenderer.a in Frameworks */,
7674
C34521591BF02516001707D2 /* libNativePresetFactory.a in Frameworks */,
77-
C34521531BF022ED001707D2 /* SDL2.framework in Frameworks */,
7875
C34521571BF0250D001707D2 /* libMilkdropPresetFactory.a in Frameworks */,
7976
C34521511BF022B1001707D2 /* libprojectM.a in Frameworks */,
8077
);
@@ -98,7 +95,6 @@
9895
C34521581BF02516001707D2 /* libNativePresetFactory.a */,
9996
C34521561BF0250D001707D2 /* libMilkdropPresetFactory.a */,
10097
C34521541BF02333001707D2 /* libRenderer.a */,
101-
C34521521BF022ED001707D2 /* SDL2.framework */,
10298
C34521501BF022B1001707D2 /* libprojectM.a */,
10399
C34521461BF02294001707D2 /* SDLprojectM */,
104100
C34521451BF02294001707D2 /* Products */,
@@ -278,12 +274,17 @@
278274
FRAMEWORK_SEARCH_PATHS = (
279275
"$(inherited)",
280276
"$(LOCAL_LIBRARY_DIR)/Frameworks",
277+
"$(USER_LIBRARY_DIR)/Frameworks",
281278
);
282279
HEADER_SEARCH_PATHS = "$(SRCROOT)/../libprojectM";
283280
LIBRARY_SEARCH_PATHS = (
284281
"$(inherited)",
285282
"$(PROJECT_DIR)",
286283
);
284+
OTHER_LDFLAGS = (
285+
"-framework",
286+
SDL2,
287+
);
287288
PRODUCT_NAME = "$(TARGET_NAME)";
288289
};
289290
name = Debug;
@@ -294,12 +295,17 @@
294295
FRAMEWORK_SEARCH_PATHS = (
295296
"$(inherited)",
296297
"$(LOCAL_LIBRARY_DIR)/Frameworks",
298+
"$(USER_LIBRARY_DIR)/Frameworks",
297299
);
298300
HEADER_SEARCH_PATHS = "$(SRCROOT)/../libprojectM";
299301
LIBRARY_SEARCH_PATHS = (
300302
"$(inherited)",
301303
"$(PROJECT_DIR)",
302304
);
305+
OTHER_LDFLAGS = (
306+
"-framework",
307+
SDL2,
308+
);
303309
PRODUCT_NAME = "$(TARGET_NAME)";
304310
};
305311
name = Release;

src/projectM-sdl/cmake_install.cmake

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)