Skip to content

Commit 716922d

Browse files
pvalletpvallet
committed
Fixed libraries not getting properly retrieved in different build configurations
1 parent 9bc79f5 commit 716922d

File tree

4 files changed

+30
-41
lines changed

4 files changed

+30
-41
lines changed

‎CMakeLists.txt

+7
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ project(${PROJECT_NAME})
66

77
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
88

9+
# Make sure all configurations output libraries in the same directory instead of in sub-directories per config
10+
# This allows easier linking from the Xcode iOS project
11+
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
12+
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
13+
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
14+
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
15+
916
if (IOS)
1017
# Disable ImageIO for SDL2_image as it's not available for iOS, just OS X, and will fail at link time
1118
set(SDL2IMAGE_BACKEND_IMAGEIO 0)

‎ios/hello_sdl2/SDL_uikit_main.c renamed to ‎ios/SDL_uikit_main.c

File renamed without changes.

‎ios/hello_sdl2.xcodeproj/project.pbxproj

+23-41
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,24 @@
1010
2556BB752D0C94A100FE92E8 /* SDL_uikit_main.c in Sources */ = {isa = PBXBuildFile; fileRef = 2556BB742D0C94A100FE92E8 /* SDL_uikit_main.c */; };
1111
2556BB772D0C94C200FE92E8 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2556BB762D0C94C200FE92E8 /* main.cpp */; };
1212
2556BB792D0C98D800FE92E8 /* res in Resources */ = {isa = PBXBuildFile; fileRef = 2556BB782D0C98D700FE92E8 /* res */; };
13-
25BD8C082D0F7E1A0097E73D /* libSDL2-2.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 25BD8C072D0F7E1A0097E73D /* libSDL2-2.0.dylib */; settings = {ATTRIBUTES = (Required, ); }; };
14-
25BD8C0B2D0F898E0097E73D /* libSDL2_image-2.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 25BD8C0A2D0F898D0097E73D /* libSDL2_image-2.0.dylib */; };
15-
25BD8C0D2D11E0FB0097E73D /* libhello_sdl2.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = 25C532E52D09F06100837DB5 /* libhello_sdl2.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
16-
25BD8C0E2D11E0FE0097E73D /* libSDL2_image-2.0.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = 25BD8C0A2D0F898D0097E73D /* libSDL2_image-2.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
17-
25BD8C0F2D11E1010097E73D /* libSDL2-2.0.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = 25BD8C072D0F7E1A0097E73D /* libSDL2-2.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
18-
25C532E62D09F06100837DB5 /* libhello_sdl2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 25C532E52D09F06100837DB5 /* libhello_sdl2.dylib */; };
13+
259506DF2D1217BB00B23E5D /* libSDL2_image-2.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 259506DC2D1217BB00B23E5D /* libSDL2_image-2.0.dylib */; };
14+
259506E02D1217BB00B23E5D /* libhello_sdl2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 259506DD2D1217BB00B23E5D /* libhello_sdl2.dylib */; };
15+
259506E12D1217BB00B23E5D /* libSDL2-2.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 259506DE2D1217BB00B23E5D /* libSDL2-2.0.dylib */; };
16+
259506E22D12185A00B23E5D /* libhello_sdl2.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = 259506DD2D1217BB00B23E5D /* libhello_sdl2.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
17+
259506E32D12185C00B23E5D /* libSDL2_image-2.0.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = 259506DC2D1217BB00B23E5D /* libSDL2_image-2.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
18+
259506E42D12185E00B23E5D /* libSDL2-2.0.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = 259506DE2D1217BB00B23E5D /* libSDL2-2.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
1919
/* End PBXBuildFile section */
2020

2121
/* Begin PBXCopyFilesBuildPhase section */
22-
254D5F802D089A9D003B033D /* Embed Libraries */ = {
22+
259506D92D120ED100B23E5D /* Embed Libraries */ = {
2323
isa = PBXCopyFilesBuildPhase;
2424
buildActionMask = 2147483647;
2525
dstPath = "";
2626
dstSubfolderSpec = 10;
2727
files = (
28-
25BD8C0E2D11E0FE0097E73D /* libSDL2_image-2.0.dylib in Embed Libraries */,
29-
25BD8C0F2D11E1010097E73D /* libSDL2-2.0.dylib in Embed Libraries */,
30-
25BD8C0D2D11E0FB0097E73D /* libhello_sdl2.dylib in Embed Libraries */,
28+
259506E32D12185C00B23E5D /* libSDL2_image-2.0.dylib in Embed Libraries */,
29+
259506E42D12185E00B23E5D /* libSDL2-2.0.dylib in Embed Libraries */,
30+
259506E22D12185A00B23E5D /* libhello_sdl2.dylib in Embed Libraries */,
3131
);
3232
name = "Embed Libraries";
3333
runOnlyForDeploymentPostprocessing = 0;
@@ -36,27 +36,22 @@
3636

3737
/* Begin PBXFileReference section */
3838
254D5F5D2D05D31A003B033D /* hello_sdl2.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = hello_sdl2.app; sourceTree = BUILT_PRODUCTS_DIR; };
39-
2556BB702D0A127D00FE92E8 /* libSDL2main.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2main.a; path = "../build_ios/_deps/sdl-build/Release-iphoneos/libSDL2main.a"; sourceTree = "<group>"; };
40-
2556BB742D0C94A100FE92E8 /* SDL_uikit_main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_uikit_main.c; path = hello_sdl2/SDL_uikit_main.c; sourceTree = "<group>"; };
39+
2556BB742D0C94A100FE92E8 /* SDL_uikit_main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_uikit_main.c; sourceTree = "<group>"; };
4140
2556BB762D0C94C200FE92E8 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../src/main.cpp; sourceTree = "<group>"; };
4241
2556BB782D0C98D700FE92E8 /* res */ = {isa = PBXFileReference; lastKnownFileType = folder; name = res; path = ../res; sourceTree = "<group>"; };
43-
25BD8C072D0F7E1A0097E73D /* libSDL2-2.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libSDL2-2.0.dylib"; path = "../build_ios/lib/Release/libSDL2-2.0.dylib"; sourceTree = "<group>"; };
44-
25BD8C0A2D0F898D0097E73D /* libSDL2_image-2.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libSDL2_image-2.0.dylib"; path = "../build_ios/lib/Release/libSDL2_image-2.0.dylib"; sourceTree = "<group>"; };
45-
25C532E52D09F06100837DB5 /* libhello_sdl2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libhello_sdl2.dylib; path = "../build_ios/Release-iphoneos/libhello_sdl2.dylib"; sourceTree = "<group>"; };
46-
25C532E82D09F5E000837DB5 /* libSDL2-2.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libSDL2-2.0.0.dylib"; path = "../build_ios/_deps/sdl-build/Release-iphoneos/libSDL2-2.0.0.dylib"; sourceTree = "<group>"; };
47-
25C532EA2D09F60100837DB5 /* libSDL2_image-2.0.801.2.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libSDL2_image-2.0.801.2.0.dylib"; path = "../build_ios/_deps/sdl_image-build/Release-iphoneos/libSDL2_image-2.0.801.2.0.dylib"; sourceTree = "<group>"; };
48-
25E1B4892D09F96000ED36C1 /* libSDL2_image-2.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libSDL2_image-2.0.dylib"; path = "../build_ios/_deps/sdl_image-build/Release-iphoneos/libSDL2_image-2.0.dylib"; sourceTree = "<group>"; };
49-
25E1B48C2D09F97C00ED36C1 /* libSDL2-2.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libSDL2-2.0.dylib"; path = "../build_ios/_deps/sdl-build/Release-iphoneos/libSDL2-2.0.dylib"; sourceTree = "<group>"; };
42+
259506DC2D1217BB00B23E5D /* libSDL2_image-2.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libSDL2_image-2.0.dylib"; path = "../build_ios/lib/libSDL2_image-2.0.dylib"; sourceTree = "<group>"; };
43+
259506DD2D1217BB00B23E5D /* libhello_sdl2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libhello_sdl2.dylib; path = ../build_ios/lib/libhello_sdl2.dylib; sourceTree = "<group>"; };
44+
259506DE2D1217BB00B23E5D /* libSDL2-2.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libSDL2-2.0.dylib"; path = "../build_ios/lib/libSDL2-2.0.dylib"; sourceTree = "<group>"; };
5045
/* End PBXFileReference section */
5146

5247
/* Begin PBXFrameworksBuildPhase section */
5348
254D5F5A2D05D31A003B033D /* Frameworks */ = {
5449
isa = PBXFrameworksBuildPhase;
5550
buildActionMask = 2147483647;
5651
files = (
57-
25BD8C082D0F7E1A0097E73D /* libSDL2-2.0.dylib in Frameworks */,
58-
25BD8C0B2D0F898E0097E73D /* libSDL2_image-2.0.dylib in Frameworks */,
59-
25C532E62D09F06100837DB5 /* libhello_sdl2.dylib in Frameworks */,
52+
259506DF2D1217BB00B23E5D /* libSDL2_image-2.0.dylib in Frameworks */,
53+
259506E02D1217BB00B23E5D /* libhello_sdl2.dylib in Frameworks */,
54+
259506E12D1217BB00B23E5D /* libSDL2-2.0.dylib in Frameworks */,
6055
);
6156
runOnlyForDeploymentPostprocessing = 0;
6257
};
@@ -69,7 +64,6 @@
6964
2556BB782D0C98D700FE92E8 /* res */,
7065
2556BB762D0C94C200FE92E8 /* main.cpp */,
7166
2556BB742D0C94A100FE92E8 /* SDL_uikit_main.c */,
72-
254D5F5F2D05D31A003B033D /* hello_sdl2 */,
7367
254D5F5E2D05D31A003B033D /* Products */,
7468
254D5F7C2D0897C3003B033D /* Frameworks */,
7569
);
@@ -83,24 +77,12 @@
8377
name = Products;
8478
sourceTree = "<group>";
8579
};
86-
254D5F5F2D05D31A003B033D /* hello_sdl2 */ = {
87-
isa = PBXGroup;
88-
children = (
89-
);
90-
path = hello_sdl2;
91-
sourceTree = "<group>";
92-
};
9380
254D5F7C2D0897C3003B033D /* Frameworks */ = {
9481
isa = PBXGroup;
9582
children = (
96-
25BD8C0A2D0F898D0097E73D /* libSDL2_image-2.0.dylib */,
97-
25BD8C072D0F7E1A0097E73D /* libSDL2-2.0.dylib */,
98-
2556BB702D0A127D00FE92E8 /* libSDL2main.a */,
99-
25E1B48C2D09F97C00ED36C1 /* libSDL2-2.0.dylib */,
100-
25E1B4892D09F96000ED36C1 /* libSDL2_image-2.0.dylib */,
101-
25C532EA2D09F60100837DB5 /* libSDL2_image-2.0.801.2.0.dylib */,
102-
25C532E82D09F5E000837DB5 /* libSDL2-2.0.0.dylib */,
103-
25C532E52D09F06100837DB5 /* libhello_sdl2.dylib */,
83+
259506DD2D1217BB00B23E5D /* libhello_sdl2.dylib */,
84+
259506DC2D1217BB00B23E5D /* libSDL2_image-2.0.dylib */,
85+
259506DE2D1217BB00B23E5D /* libSDL2-2.0.dylib */,
10486
);
10587
name = Frameworks;
10688
sourceTree = "<group>";
@@ -116,7 +98,7 @@
11698
254D5F592D05D31A003B033D /* Sources */,
11799
254D5F5A2D05D31A003B033D /* Frameworks */,
118100
254D5F5B2D05D31A003B033D /* Resources */,
119-
254D5F802D089A9D003B033D /* Embed Libraries */,
101+
259506D92D120ED100B23E5D /* Embed Libraries */,
120102
);
121103
buildRules = (
122104
);
@@ -340,7 +322,7 @@
340322
"$(inherited)",
341323
"@executable_path/Frameworks",
342324
);
343-
LIBRARY_SEARCH_PATHS = ../build_ios/lib/Debug;
325+
LIBRARY_SEARCH_PATHS = ../build_ios/lib/;
344326
MARKETING_VERSION = 1.0;
345327
PRODUCT_BUNDLE_IDENTIFIER = "pvallet.com.github.hello-sdl2";
346328
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -375,7 +357,7 @@
375357
"$(inherited)",
376358
"@executable_path/Frameworks",
377359
);
378-
LIBRARY_SEARCH_PATHS = ../build_ios/lib/Release;
360+
LIBRARY_SEARCH_PATHS = ../build_ios/lib/;
379361
MARKETING_VERSION = 1.0;
380362
PRODUCT_BUNDLE_IDENTIFIER = "pvallet.com.github.hello-sdl2";
381363
PRODUCT_NAME = "$(TARGET_NAME)";

‎ios/hello_sdl2.xcodeproj/project.xcworkspace/xcuserdata/charlotte.stangebyehansen.xcuserdatad/UserInterfaceState.xcuserstate

15.1 KB
Binary file not shown.

0 commit comments

Comments
 (0)