Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
ffb010c0
Commit
ffb010c0
authored
Nov 22, 2011
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: SDL_image: fix OSX build
parent
4be01fd3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
11 deletions
+24
-11
contrib/TODO
contrib/TODO
+0
-3
contrib/src/SDL_image/SDL_image.patch
contrib/src/SDL_image/SDL_image.patch
+24
-8
No files found.
contrib/TODO
View file @
ffb010c0
...
...
@@ -2,9 +2,6 @@ binary package downloading/extraction (prebuilt contribs)
### Missing software for MacOSX
SDL_image fails to build : Undefined symbols (missing OpenGL framework?)
=> we used r4444 of their SVN on OSX (only) for undocumented reasons
# These 3 are binary framework downloads : no source code is used
BGHUDAppKit
Growl -- last free version: 1.3.0: http://code.google.com/p/growl/source/list http://itunes.apple.com/us/app/growl/id467939042
...
...
contrib/src/SDL_image/SDL_image.patch
View file @
ffb010c0
diff -ruN SDL_image/Makefile.am SDL_image_new/Makefile.am
--- SDL_image/Makefile.am 2007-07-21 07:26:34.000000000 +0200
+++ SDL_image_new/Makefile.am 2007-08-04 12:08:51.000000000 +0200
@@ -44,7 +44,6 @@
--- SDL_image/Makefile.am.orig 2009-11-08 05:55:32.000000000 -0500
+++ SDL_image/Makefile.am 2011-11-22 22:17:14.234702385 -0500
@@ -47,7 +47,6 @@
else
libSDL_image_la_LDFLAGS = \
-no-undefined \
...
...
@@ -9,10 +8,27 @@ diff -ruN SDL_image/Makefile.am SDL_image_new/Makefile.am
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
libSDL_image_la_LIBADD = $(IMG_LIBS)
endif
diff -ruN SDL_image/Makefile.in SDL_image_new/Makefile.in
--- SDL_image/Makefile.in 2007-07-21 07:27:57.000000000 +0200
+++ SDL_image_new/Makefile.in 2007-08-04 12:12:00.000000000 +0200
@@ -260,12 +260,10 @@
@@ -58,7 +57,7 @@
%.o : %.rc
$(WINDRES) $< $@
-noinst_PROGRAMS = showimage
+#noinst_PROGRAMS = showimage
showimage_LDADD = libSDL_image.la
--- SDL_image/Makefile.in.orig 2009-11-12 01:42:10.000000000 -0500
+++ SDL_image/Makefile.in 2011-11-22 22:17:10.714684927 -0500
@@ -41,7 +41,7 @@
host_triplet = @host@
@USE_VERSION_RC_FALSE@libSDL_image_la_DEPENDENCIES = \
@USE_VERSION_RC_FALSE@ $(am__DEPENDENCIES_1)
-noinst_PROGRAMS = showimage$(EXEEXT)
+#noinst_PROGRAMS = showimage$(EXEEXT)
subdir = .
DIST_COMMON = README $(am__configure_deps) \
$(libSDL_imageinclude_HEADERS) $(srcdir)/Makefile.am \
@@ -297,12 +297,10 @@
@USE_VERSION_RC_FALSE@libSDL_image_la_LDFLAGS = \
@USE_VERSION_RC_FALSE@ -no-undefined \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment