diff --git a/app/app.pro b/app/app.pro index 25272f0a..d1a8e9fb 100644 --- a/app/app.pro +++ b/app/app.pro @@ -37,8 +37,8 @@ win32 { LIBS += ws2_32.lib winmm.lib dxva2.lib ole32.lib } macx { - INCLUDEPATH += $$PWD/../libs/mac/include - LIBS += -L$$PWD/../libs/mac/lib + INCLUDEPATH += $$PWD/../libs/mac/include $$PWD/../libs/mac/Frameworks/SDL2.framework/Versions/A/Headers + LIBS += -L$$PWD/../libs/mac/lib -F$$PWD/../libs/mac/Frameworks } unix:!macx { @@ -60,7 +60,7 @@ win32 { CONFIG += ffmpeg } macx { - LIBS += -lssl -lcrypto -lSDL2 -lavcodec.58 -lavutil.56 + LIBS += -lssl -lcrypto -lavcodec.58 -lavutil.56 -framework SDL2 LIBS += -lobjc -framework VideoToolbox -framework AVFoundation -framework CoreVideo -framework CoreGraphics -framework CoreMedia -framework AppKit CONFIG += ffmpeg } diff --git a/libs/mac/Frameworks/SDL2.framework/Headers b/libs/mac/Frameworks/SDL2.framework/Headers new file mode 120000 index 00000000..a177d2a6 --- /dev/null +++ b/libs/mac/Frameworks/SDL2.framework/Headers @@ -0,0 +1 @@ +Versions/Current/Headers \ No newline at end of file diff --git a/libs/mac/Frameworks/SDL2.framework/Resources b/libs/mac/Frameworks/SDL2.framework/Resources new file mode 120000 index 00000000..953ee36f --- /dev/null +++ b/libs/mac/Frameworks/SDL2.framework/Resources @@ -0,0 +1 @@ +Versions/Current/Resources \ No newline at end of file diff --git a/libs/mac/Frameworks/SDL2.framework/SDL2 b/libs/mac/Frameworks/SDL2.framework/SDL2 new file mode 120000 index 00000000..9dd4e4fb --- /dev/null +++ b/libs/mac/Frameworks/SDL2.framework/SDL2 @@ -0,0 +1 @@ +Versions/Current/SDL2 \ No newline at end of file diff --git a/libs/mac/include/SDL.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL.h similarity index 100% rename from libs/mac/include/SDL.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL.h diff --git a/libs/mac/include/SDL_assert.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_assert.h similarity index 100% rename from libs/mac/include/SDL_assert.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_assert.h diff --git a/libs/mac/include/SDL_atomic.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_atomic.h similarity index 100% rename from libs/mac/include/SDL_atomic.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_atomic.h diff --git a/libs/mac/include/SDL_audio.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_audio.h similarity index 100% rename from libs/mac/include/SDL_audio.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_audio.h diff --git a/libs/mac/include/SDL_bits.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_bits.h similarity index 100% rename from libs/mac/include/SDL_bits.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_bits.h diff --git a/libs/mac/include/SDL_blendmode.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_blendmode.h similarity index 100% rename from libs/mac/include/SDL_blendmode.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_blendmode.h diff --git a/libs/mac/include/SDL_clipboard.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_clipboard.h similarity index 100% rename from libs/mac/include/SDL_clipboard.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_clipboard.h diff --git a/libs/mac/include/SDL_config.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config.h similarity index 100% rename from libs/mac/include/SDL_config.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config.h diff --git a/libs/mac/include/SDL_config_macosx.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h similarity index 100% rename from libs/mac/include/SDL_config_macosx.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h diff --git a/libs/mac/include/SDL_copying.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_copying.h similarity index 100% rename from libs/mac/include/SDL_copying.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_copying.h diff --git a/libs/mac/include/SDL_cpuinfo.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h similarity index 100% rename from libs/mac/include/SDL_cpuinfo.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h diff --git a/libs/mac/include/SDL_endian.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_endian.h similarity index 100% rename from libs/mac/include/SDL_endian.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_endian.h diff --git a/libs/mac/include/SDL_error.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_error.h similarity index 100% rename from libs/mac/include/SDL_error.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_error.h diff --git a/libs/mac/include/SDL_events.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_events.h similarity index 100% rename from libs/mac/include/SDL_events.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_events.h diff --git a/libs/mac/include/SDL_filesystem.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_filesystem.h similarity index 100% rename from libs/mac/include/SDL_filesystem.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_filesystem.h diff --git a/libs/mac/include/SDL_gamecontroller.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h similarity index 100% rename from libs/mac/include/SDL_gamecontroller.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h diff --git a/libs/mac/include/SDL_gesture.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gesture.h similarity index 100% rename from libs/mac/include/SDL_gesture.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_gesture.h diff --git a/libs/mac/include/SDL_haptic.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_haptic.h similarity index 100% rename from libs/mac/include/SDL_haptic.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_haptic.h diff --git a/libs/mac/include/SDL_hints.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_hints.h similarity index 100% rename from libs/mac/include/SDL_hints.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_hints.h diff --git a/libs/mac/include/SDL_joystick.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_joystick.h similarity index 100% rename from libs/mac/include/SDL_joystick.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_joystick.h diff --git a/libs/mac/include/SDL_keyboard.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_keyboard.h similarity index 100% rename from libs/mac/include/SDL_keyboard.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_keyboard.h diff --git a/libs/mac/include/SDL_keycode.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_keycode.h similarity index 100% rename from libs/mac/include/SDL_keycode.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_keycode.h diff --git a/libs/mac/include/SDL_loadso.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_loadso.h similarity index 100% rename from libs/mac/include/SDL_loadso.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_loadso.h diff --git a/libs/mac/include/SDL_log.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_log.h similarity index 100% rename from libs/mac/include/SDL_log.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_log.h diff --git a/libs/mac/include/SDL_main.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_main.h similarity index 100% rename from libs/mac/include/SDL_main.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_main.h diff --git a/libs/mac/include/SDL_messagebox.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_messagebox.h similarity index 100% rename from libs/mac/include/SDL_messagebox.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_messagebox.h diff --git a/libs/mac/include/SDL_mouse.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_mouse.h similarity index 100% rename from libs/mac/include/SDL_mouse.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_mouse.h diff --git a/libs/mac/include/SDL_mutex.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_mutex.h similarity index 100% rename from libs/mac/include/SDL_mutex.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_mutex.h diff --git a/libs/mac/include/SDL_name.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_name.h similarity index 100% rename from libs/mac/include/SDL_name.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_name.h diff --git a/libs/mac/include/SDL_opengl.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengl.h similarity index 100% rename from libs/mac/include/SDL_opengl.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengl.h diff --git a/libs/mac/include/SDL_opengl_glext.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengl_glext.h similarity index 100% rename from libs/mac/include/SDL_opengl_glext.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengl_glext.h diff --git a/libs/mac/include/SDL_opengles.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles.h similarity index 100% rename from libs/mac/include/SDL_opengles.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles.h diff --git a/libs/mac/include/SDL_opengles2.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2.h similarity index 100% rename from libs/mac/include/SDL_opengles2.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2.h diff --git a/libs/mac/include/SDL_opengles2_gl2.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2.h similarity index 100% rename from libs/mac/include/SDL_opengles2_gl2.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2.h diff --git a/libs/mac/include/SDL_opengles2_gl2ext.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2ext.h similarity index 100% rename from libs/mac/include/SDL_opengles2_gl2ext.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2ext.h diff --git a/libs/mac/include/SDL_opengles2_gl2platform.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2platform.h similarity index 100% rename from libs/mac/include/SDL_opengles2_gl2platform.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_gl2platform.h diff --git a/libs/mac/include/SDL_opengles2_khrplatform.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_khrplatform.h similarity index 100% rename from libs/mac/include/SDL_opengles2_khrplatform.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_opengles2_khrplatform.h diff --git a/libs/mac/include/SDL_pixels.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_pixels.h similarity index 100% rename from libs/mac/include/SDL_pixels.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_pixels.h diff --git a/libs/mac/include/SDL_platform.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_platform.h similarity index 100% rename from libs/mac/include/SDL_platform.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_platform.h diff --git a/libs/mac/include/SDL_power.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_power.h similarity index 100% rename from libs/mac/include/SDL_power.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_power.h diff --git a/libs/mac/include/SDL_quit.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_quit.h similarity index 100% rename from libs/mac/include/SDL_quit.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_quit.h diff --git a/libs/mac/include/SDL_rect.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_rect.h similarity index 100% rename from libs/mac/include/SDL_rect.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_rect.h diff --git a/libs/mac/include/SDL_render.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_render.h similarity index 100% rename from libs/mac/include/SDL_render.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_render.h diff --git a/libs/mac/include/SDL_revision.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_revision.h similarity index 100% rename from libs/mac/include/SDL_revision.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_revision.h diff --git a/libs/mac/include/SDL_rwops.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_rwops.h similarity index 100% rename from libs/mac/include/SDL_rwops.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_rwops.h diff --git a/libs/mac/include/SDL_scancode.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_scancode.h similarity index 100% rename from libs/mac/include/SDL_scancode.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_scancode.h diff --git a/libs/mac/include/SDL_shape.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_shape.h similarity index 100% rename from libs/mac/include/SDL_shape.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_shape.h diff --git a/libs/mac/include/SDL_stdinc.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_stdinc.h similarity index 100% rename from libs/mac/include/SDL_stdinc.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_stdinc.h diff --git a/libs/mac/include/SDL_surface.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_surface.h similarity index 100% rename from libs/mac/include/SDL_surface.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_surface.h diff --git a/libs/mac/include/SDL_system.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_system.h similarity index 100% rename from libs/mac/include/SDL_system.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_system.h diff --git a/libs/mac/include/SDL_syswm.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_syswm.h similarity index 100% rename from libs/mac/include/SDL_syswm.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_syswm.h diff --git a/libs/mac/include/SDL_thread.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_thread.h similarity index 100% rename from libs/mac/include/SDL_thread.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_thread.h diff --git a/libs/mac/include/SDL_timer.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_timer.h similarity index 100% rename from libs/mac/include/SDL_timer.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_timer.h diff --git a/libs/mac/include/SDL_touch.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_touch.h similarity index 100% rename from libs/mac/include/SDL_touch.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_touch.h diff --git a/libs/mac/include/SDL_types.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_types.h similarity index 100% rename from libs/mac/include/SDL_types.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_types.h diff --git a/libs/mac/include/SDL_version.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_version.h similarity index 100% rename from libs/mac/include/SDL_version.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_version.h diff --git a/libs/mac/include/SDL_video.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_video.h similarity index 100% rename from libs/mac/include/SDL_video.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_video.h diff --git a/libs/mac/include/SDL_vulkan.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_vulkan.h similarity index 100% rename from libs/mac/include/SDL_vulkan.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/SDL_vulkan.h diff --git a/libs/mac/include/begin_code.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/begin_code.h similarity index 100% rename from libs/mac/include/begin_code.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/begin_code.h diff --git a/libs/mac/include/close_code.h b/libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/close_code.h similarity index 100% rename from libs/mac/include/close_code.h rename to libs/mac/Frameworks/SDL2.framework/Versions/A/Headers/close_code.h diff --git a/libs/mac/Frameworks/SDL2.framework/Versions/A/Resources/Info.plist b/libs/mac/Frameworks/SDL2.framework/Versions/A/Resources/Info.plist new file mode 100644 index 00000000..14fd0440 --- /dev/null +++ b/libs/mac/Frameworks/SDL2.framework/Versions/A/Resources/Info.plist @@ -0,0 +1,46 @@ + + + + + BuildMachineOSBuild + 17C88 + CFBundleDevelopmentRegion + English + CFBundleExecutable + SDL2 + CFBundleGetInfoString + http://www.libsdl.org + CFBundleIdentifier + org.libsdl.SDL2 + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + Simple DirectMedia Layer + CFBundlePackageType + FMWK + CFBundleShortVersionString + 2.0.8 + CFBundleSignature + SDLX + CFBundleSupportedPlatforms + + MacOSX + + CFBundleVersion + 2.0.8 + DTCompiler + com.apple.compilers.llvm.clang.1_0 + DTPlatformBuild + 9C40b + DTPlatformVersion + GM + DTSDKBuild + 17C76 + DTSDKName + macosx10.13 + DTXcode + 0920 + DTXcodeBuild + 9C40b + + diff --git a/libs/mac/lib/libSDL2.dylib b/libs/mac/Frameworks/SDL2.framework/Versions/A/SDL2 similarity index 100% rename from libs/mac/lib/libSDL2.dylib rename to libs/mac/Frameworks/SDL2.framework/Versions/A/SDL2 diff --git a/libs/mac/Frameworks/SDL2.framework/Versions/A/_CodeSignature/CodeResources b/libs/mac/Frameworks/SDL2.framework/Versions/A/_CodeSignature/CodeResources new file mode 100644 index 00000000..02ad89ac --- /dev/null +++ b/libs/mac/Frameworks/SDL2.framework/Versions/A/_CodeSignature/CodeResources @@ -0,0 +1,792 @@ + + + + + files + + Resources/Info.plist + + dts8ape5zBg3+8u8BQ5kWqp9cC8= + + + files2 + + Headers/SDL.h + + hash + + wiqwnVgtbgjGPAOFejxz8yw7geU= + + hash2 + + LLwzMAHn2OsCr2SVR7M71KeQf+TiJpHk/KKojzQdRlI= + + + Headers/SDL_assert.h + + hash + + zWoE6/P7ZWAYr4J+EVgDAK+kot8= + + hash2 + + tuS18C7A11akqH9MWT0WWCb6q7kcF97Ui5OFwNtSF/k= + + + Headers/SDL_atomic.h + + hash + + /q15zvR2djPgTRkySENYqzisn64= + + hash2 + + n9rGA8zXFxasUnN0ytgLLWmW2CDCtKBeGJZcfB+nfRc= + + + Headers/SDL_audio.h + + hash + + 9uJv81fH9Op/f3sF7/GVuNYQNOc= + + hash2 + + KDokTSV3kZuHCQFFrRum3VoTP1QSW2xAghjceoIArXY= + + + Headers/SDL_bits.h + + hash + + yp8Jj93ZE224v1+u++cOexlp9RY= + + hash2 + + kQTBxFYnOjKSlti4H7pAYZWdkH0BpQ9Eq54E/r/nlVY= + + + Headers/SDL_blendmode.h + + hash + + kgTnzOrp0kqeI8lzDgQyT/gCGiM= + + hash2 + + d/8B0iLh4aFeoaPEFqQ4C6x4ISlDJCKrybaKuHCJHL4= + + + Headers/SDL_clipboard.h + + hash + + qq1r82AS7fHG8G94+jvL41iKEyA= + + hash2 + + +r0LOXHGRf2Q9+FkqRU6i++1zEzsE5sWXxxMGrsSyKk= + + + Headers/SDL_config.h + + hash + + nJnfliCMDJUfOG8t4QYt5U9tFBY= + + hash2 + + qkVvxnI+XRMTIdbzQ9tV+ERRc75r/EzWu0qRTgt5K5c= + + + Headers/SDL_config_macosx.h + + hash + + D0LXp0FibaaLSE6877hbyqf2Jb8= + + hash2 + + pCQLXwJ6HaGZiG5vr9njJtgNcIV9p0mxcSJtYoj147A= + + + Headers/SDL_copying.h + + hash + + 0DKOkPvRlLo00X7iE2fL4i8XBww= + + hash2 + + nHJ8cj/FeSfLoRm5gRiDk73eyYlKn7u1BfbqkB2ofLg= + + + Headers/SDL_cpuinfo.h + + hash + + 2wleDfJFmCBrEssrE9rcuaiqOLQ= + + hash2 + + MEpF0mFQFLhuTV+5uSB++q8tT2z5heESxyP1HuzuKxc= + + + Headers/SDL_endian.h + + hash + + WmJrxu+b1MkjtE6ttCymwH4EVC0= + + hash2 + + 77hv0QIqlra/8gcQF81aAwP21/ZAANKiIaJRV1QK8mk= + + + Headers/SDL_error.h + + hash + + HMprigJ3u4PqQ7B+gD1UUbTSrJ8= + + hash2 + + errosoVYCD45UvQVzL4Lmfq4eCQg92a6xUZ062DGEL4= + + + Headers/SDL_events.h + + hash + + ptgRA0IBsCg5za/lwhTOPGNmekY= + + hash2 + + lwISPqzee6nV4HCHaMzZCVJJAtFZmoi8cYlJkY41wKA= + + + Headers/SDL_filesystem.h + + hash + + 9rIKoCtsAONdgfT/4QKm3a56hV0= + + hash2 + + l5nBvMglAIFEWf357KMyQ+E7cr4GqO9XNwevA04+VmQ= + + + Headers/SDL_gamecontroller.h + + hash + + sUaSBwOprX7A696W6u2oOtIne+Y= + + hash2 + + VZDstHk/V+tZik3q3xnDCAG3AfA+BoHk9lB406mKtxU= + + + Headers/SDL_gesture.h + + hash + + d80fR6I92r+G26xckkQzTRj/tj4= + + hash2 + + /5+tOQWQ9raopqBCExlH9ClAA/fVAfEBIrd/WlpaqIE= + + + Headers/SDL_haptic.h + + hash + + 95rNclZzbsuV6pyeG8cbIETgS84= + + hash2 + + O4RUmC9HMqsjAf22Ru6z5j9HaYTsc7SxOnzOXPR3kz0= + + + Headers/SDL_hints.h + + hash + + UjEgXfZiLUmQTh9G+Bkx8Y1Ov6k= + + hash2 + + DqFPmBXNg9BovdIAlipnBKZo5mcQJCrLmhyIM/O+tvU= + + + Headers/SDL_joystick.h + + hash + + 97SJSCx+xjRHUQ6ilndhP8TZ110= + + hash2 + + xYWL+BS5f9NGr7eeP+vL0kD5K6O99PXgOWLT2Bx2dRQ= + + + Headers/SDL_keyboard.h + + hash + + RsaE9DMLq9lFsYokvdaQ8nhIkfY= + + hash2 + + tpZGEHU3TKCozcYf4MA9gA5bXNPSxx9rqqBaPttgr+4= + + + Headers/SDL_keycode.h + + hash + + 9nIqgM67nCJUdjV3iiiviT8DFhk= + + hash2 + + SpMclG+epmPQibi3fNsQe1lBUxZPJOOu4DfQjpTZYgw= + + + Headers/SDL_loadso.h + + hash + + m+OEcfHbykTuEo6P3/y/kuV1xjk= + + hash2 + + Yg3OrZpF17uC69TwprPyrpn3+su3YAaaA1hTNXAHxLw= + + + Headers/SDL_log.h + + hash + + HcUUwymYqVSfgz2LdtuUqZSwjUY= + + hash2 + + j4F34jvgNTEcHQQoPbBBugi4RKQLhGM+x4ndXdtDc0E= + + + Headers/SDL_main.h + + hash + + 7I0GPDiLKlavuXuoepYsl2mS6CI= + + hash2 + + qwXROmpXppMPodetUGE0s/7HHmwfu3taLUeiiu+APk0= + + + Headers/SDL_messagebox.h + + hash + + MEB/oCw7dyinbrBmQQqh46/uRVk= + + hash2 + + DSuDS/nAzfEi2kO06DEpxRLj5V1++p2DYYA9Oou8ewQ= + + + Headers/SDL_mouse.h + + hash + + I2UksqoB5v6RX64Ddwea9dW0sO0= + + hash2 + + gFMH6bBzvJCff8F7FMWlP6o6TydFmiXEu0daWp166wk= + + + Headers/SDL_mutex.h + + hash + + H6Q1bWPDKu2RsALoLzTBzPTrPkk= + + hash2 + + WKU8g7bVD3KpQEgvXuUGrPcG5hgg+LwQBgzLQCeSVTg= + + + Headers/SDL_name.h + + hash + + doLASBj4oiSiP6MW9wQblnyPN1E= + + hash2 + + M0b8pslMMsWZp1KDVUdqX7ml3DKUVcwiTcfwGbhopvA= + + + Headers/SDL_opengl.h + + hash + + ZN9vVzyxx542ZCZ4nmASJKJ7qFM= + + hash2 + + dazK6AC8BOZXW9m9761qsuoqe3eJozPIbSc1YEY3UVE= + + + Headers/SDL_opengl_glext.h + + hash + + nqPX1ObCVYyVzW3VbD3C/1vaTRE= + + hash2 + + IULBL/m+rBc3UQPqu68w6FDM/Mda58oybFnlyn3OkjE= + + + Headers/SDL_opengles.h + + hash + + aVEa5N2CHg93ZxdDuKfDtFnCbU8= + + hash2 + + 3CmcA5B4ydtkVin3NvNmYVHfgnhJJAVYNVw1YKM0Mko= + + + Headers/SDL_opengles2.h + + hash + + yQ5nSugeN94hMSNhsIOmlAstJhY= + + hash2 + + 8H2lt37zXZs68UfBlqDGqSJTQ2+Slu7qywggJ2mIosI= + + + Headers/SDL_opengles2_gl2.h + + hash + + g4y04zPFy1H/qujSNGRd0vB7ClQ= + + hash2 + + 9GAwK0cg8YPrZHWVqMGpyVwKFz3Ay9VHiyz70jzWltA= + + + Headers/SDL_opengles2_gl2ext.h + + hash + + bTlnL+42kbi+n/gH//X2p0pqeuM= + + hash2 + + 5404JOHXH4pGO60gR/uLhz9zW6fKy9jvdMw5i1WTcpo= + + + Headers/SDL_opengles2_gl2platform.h + + hash + + ByFMXJFtjcRglS/e0+DujyjC3dM= + + hash2 + + wlKRTsmTMrnniYqSvQklJfb9VF07J0MDpqzYOcfiDDY= + + + Headers/SDL_opengles2_khrplatform.h + + hash + + NLpJq9uBqjOpWhXISOQHPnTp/XQ= + + hash2 + + djHeDyzmR0e/2JNIbqpBqgi56MXlxlAbgcBFxuvwSyo= + + + Headers/SDL_pixels.h + + hash + + q2Uas2PGwUNo30Wiqomvrb03mp4= + + hash2 + + fpczDM4z7VLJW6FMvRTygnypORPdk2q89S1kCbS2fpM= + + + Headers/SDL_platform.h + + hash + + aM0ptLXVxYx4yXLsNYOssy/jx9Y= + + hash2 + + R6MDdJ2ZUd9FGKReGdJE6YyHwqczb99jK9/IDW59AmI= + + + Headers/SDL_power.h + + hash + + NqkQCWzmodWGdUFUZmzR9B/TApc= + + hash2 + + VkJkbp+5Wd4WYDemJiu8R/emdH4PZSNPweoPmzRkfxM= + + + Headers/SDL_quit.h + + hash + + eOEJzybg3UBfe83rKNfky9XAVGM= + + hash2 + + mN/T7PjHVtVce+/m7tIWIH8p8lylLWPuJAkCsbEvjhg= + + + Headers/SDL_rect.h + + hash + + B7oWq3VOxrWbVn0YV8xpvXG6dic= + + hash2 + + dCsZcEfdmcr1RuOycWAtHnnQs5BWk8lw0Ubnv/aUwG4= + + + Headers/SDL_render.h + + hash + + ATenWUmKg6AEbv2SbCy9JfT8jCw= + + hash2 + + EYiKPX5wRIcWkCyROlT59wuiDupZ6yp0+YsDWOrhtnQ= + + + Headers/SDL_revision.h + + hash + + XBn2NI8Qm53MeZGaXVB3fQrs0uc= + + hash2 + + FHG6Lqi1wMmjow+JjxKYy/LAoqP+iDH8QYuJS1zr6T4= + + + Headers/SDL_rwops.h + + hash + + ULSy/1QoNQhBu3kk75qXo30Wcvs= + + hash2 + + KewlZ14FJ6CfLjd7EDc1KlVSiUhIt2P9d3p2VEJuUUA= + + + Headers/SDL_scancode.h + + hash + + FAcbPIsuPOYbsldZL4m0AFUeoW4= + + hash2 + + 5VaZC9IfMuNgz3h6OJn9Q/IGB/+cpymxIrjkluCWzOo= + + + Headers/SDL_shape.h + + hash + + S5Ty+gKktVyifkoYT0K7E48JqdI= + + hash2 + + LVwSnfZBuKL1bW2zy4rt0vRPmH2/ZxfmP0xB9pLVEOE= + + + Headers/SDL_stdinc.h + + hash + + qBTB0Yqh+34vD3n3dN9ry9GwqJM= + + hash2 + + TDMriI0PPYF73lvh6suExzpMldCmX1SkLgg+wkBqt7A= + + + Headers/SDL_surface.h + + hash + + bssTKTIF4Yw/3a6fyF7GhaVrdU0= + + hash2 + + zRF/b8bCqjClZnbPorqjhlWw9aujM9RwnVemHyiC2yM= + + + Headers/SDL_system.h + + hash + + n2WodCV+WpbfpFSKUUKpB/i5ZPw= + + hash2 + + 3W0Z/Fdwbc7dTyR+v4g6eVE58XcEYLTzDGO+RMwcmJc= + + + Headers/SDL_syswm.h + + hash + + QoebSqgb1XslKPBwMiUOM6daVKo= + + hash2 + + rCqmdvdibhT5MBOnvKCT0gK7Howb5uLewC321yLYr5U= + + + Headers/SDL_thread.h + + hash + + fXCWQD4MIniqvdB6pWVwlxNS9jk= + + hash2 + + 18iJ1yFzOTeiM30JwK3GMlbgUqzNDIQiw3ZLLr3M+XQ= + + + Headers/SDL_timer.h + + hash + + qfzyWhIh36SK6BAcdd50D/MfdGo= + + hash2 + + 5Qe92nVkUnHbxgbGwxkyglvVKajhfgVhxPei6dhr4c0= + + + Headers/SDL_touch.h + + hash + + yyJt6piMAcoFWhFqsHk9mo3MtaI= + + hash2 + + 9mQ2V937DAO6OjcQFMboFrnJEiqdk+2uHBzdvMYUnd0= + + + Headers/SDL_types.h + + hash + + oVg7CzABdDKtxCWINHaUvBRbRZ0= + + hash2 + + 8uZym5ly46CZ4VQZCz/Y/cH4THoDS8kGqrvB+Ux/254= + + + Headers/SDL_version.h + + hash + + nKLee2vSNZZK9p94Up9o87OoiDE= + + hash2 + + F3dpo9XlvebIS2NLJ1ovH+W7fG3bzb01F8OKUeqd+U0= + + + Headers/SDL_video.h + + hash + + UFZPU1U3CDog3RBKdd5wu9LFQZk= + + hash2 + + 6/OCq92BIQnGHBLmlGX4nUNnfLM7LzPoMp+lPlYY4ew= + + + Headers/SDL_vulkan.h + + hash + + eLdIezOR2pV1ai5rLBrtiR3NAok= + + hash2 + + iCB8avj2P0+ZkjVGfTchu5BAd7BJ+LeC1fJ9BU+80IE= + + + Headers/begin_code.h + + hash + + 6RX1yuMtg6N9G2iCtCjjKzPCkuU= + + hash2 + + JQ71zTwAp3EzI22aBP3w80YYEcxNBRF8/0DkqO39oDo= + + + Headers/close_code.h + + hash + + IDKa63p9RAIkSpPXA0mU/dzgBWQ= + + hash2 + + oF0I0dcQDvLcuEIgqx9wEQiuqHR5KLoq1zhL/AK5geg= + + + Resources/Info.plist + + hash + + dts8ape5zBg3+8u8BQ5kWqp9cC8= + + hash2 + + ZCgx1szeVwObsPiq6VoZh8Q9ym7l+7WXzv0HTSoFT0U= + + + + rules + + ^Resources/ + + ^Resources/.*\.lproj/ + + optional + + weight + 1000 + + ^Resources/.*\.lproj/locversion.plist$ + + omit + + weight + 1100 + + ^Resources/Base\.lproj/ + + weight + 1010 + + ^version.plist$ + + + rules2 + + .*\.dSYM($|/) + + weight + 11 + + ^(.*/)?\.DS_Store$ + + omit + + weight + 2000 + + ^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/ + + nested + + weight + 10 + + ^.* + + ^Info\.plist$ + + omit + + weight + 20 + + ^PkgInfo$ + + omit + + weight + 20 + + ^Resources/ + + weight + 20 + + ^Resources/.*\.lproj/ + + optional + + weight + 1000 + + ^Resources/.*\.lproj/locversion.plist$ + + omit + + weight + 1100 + + ^Resources/Base\.lproj/ + + weight + 1010 + + ^[^/]+$ + + nested + + weight + 10 + + ^embedded\.provisionprofile$ + + weight + 20 + + ^version\.plist$ + + weight + 20 + + + + diff --git a/libs/mac/Frameworks/SDL2.framework/Versions/Current b/libs/mac/Frameworks/SDL2.framework/Versions/Current new file mode 120000 index 00000000..8c7e5a66 --- /dev/null +++ b/libs/mac/Frameworks/SDL2.framework/Versions/Current @@ -0,0 +1 @@ +A \ No newline at end of file diff --git a/libs/mac/lib/libavcodec.58.dylib b/libs/mac/lib/libavcodec.58.dylib index 881d1bf7..917148a0 100755 Binary files a/libs/mac/lib/libavcodec.58.dylib and b/libs/mac/lib/libavcodec.58.dylib differ diff --git a/libs/mac/lib/libavutil.56.dylib b/libs/mac/lib/libavutil.56.dylib index 13edb0f7..9730976f 100755 Binary files a/libs/mac/lib/libavutil.56.dylib and b/libs/mac/lib/libavutil.56.dylib differ diff --git a/libs/mac/lib/libcrypto.dylib b/libs/mac/lib/libcrypto.dylib old mode 100644 new mode 100755 index 915e20b6..5047dc33 Binary files a/libs/mac/lib/libcrypto.dylib and b/libs/mac/lib/libcrypto.dylib differ diff --git a/libs/mac/lib/libssl.dylib b/libs/mac/lib/libssl.dylib old mode 100644 new mode 100755 index 786bfd92..f83d75b2 Binary files a/libs/mac/lib/libssl.dylib and b/libs/mac/lib/libssl.dylib differ diff --git a/libs/mac/lib/libswresample.3.dylib b/libs/mac/lib/libswresample.3.dylib index e77e9f53..1e2a9f1d 100755 Binary files a/libs/mac/lib/libswresample.3.dylib and b/libs/mac/lib/libswresample.3.dylib differ diff --git a/scripts/generate-dmg.sh b/scripts/generate-dmg.sh new file mode 100755 index 00000000..e34f9743 --- /dev/null +++ b/scripts/generate-dmg.sh @@ -0,0 +1,46 @@ +BUILD_CONFIG=$1 + +fail() +{ + echo "$1" 1>&2 + exit 1 +} + +if [ "$BUILD_CONFIG" != "Debug" ] && [ "$BUILD_CONFIG" != "Release" ]; then + fail "Invalid build configuration" +fi + +BUILD_ROOT=$PWD/build +SOURCE_ROOT=$PWD +BUILD_FOLDER=$BUILD_ROOT/build-$BUILD_CONFIG +INSTALLER_FOLDER=$BUILD_ROOT/installer-$BUILD_CONFIG + +echo Cleaning output directories +rm -rf $BUILD_FOLDER +rm -rf $INSTALLER_FOLDER +mkdir $BUILD_ROOT +mkdir $BUILD_FOLDER +mkdir $INSTALLER_FOLDER + +echo Configuring the project +pushd $BUILD_FOLDER +qmake $SOURCE_ROOT/moonlight-qt.pro || fail "Qmake failed!" +popd + +echo Compiling Moonlight in $BUILD_CONFIG configuration +pushd $BUILD_FOLDER +make $(echo "$BUILD_CONFIG" | tr '[:upper:]' '[:lower:]') || fail "Make failed!" +popd + +echo Copying dylib dependencies +mkdir $BUILD_FOLDER/app/Moonlight.app/Contents/lib +cp $SOURCE_ROOT/libs/mac/lib/*.dylib $BUILD_FOLDER/app/Moonlight.app/Contents/lib/ + +echo Copying frameworks dependencies +mkdir $BUILD_FOLDER/app/Moonlight.app/Contents/Frameworks +cp -R $SOURCE_ROOT/libs/mac/Frameworks/ $BUILD_FOLDER/app/Moonlight.app/Contents/Frameworks/ + +echo Creating DMG +EXTRA_ARGS= +if [ "$BUILD_CONFIG" == "Debug" ]; then EXTRA_ARGS=-use-debug-libs; fi +macdeployqt $BUILD_FOLDER/app/Moonlight.app -dmg $EXTRA_ARGS -qmldir=$SOURCE_ROOT/app/gui -appstore-compliant \ No newline at end of file