diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2007-10-19 21:03:47 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2007-10-19 21:03:47 +0000 |
| commit | b49a596ffdac97822b1f578e46527097b6c5bdff (patch) | |
| tree | 254330083f141e9cadf0be9945dc419e9c9992a1 /rules/sdl.make | |
| parent | ce11e64c8e61f4edbc26ee480c5b49787f12b8c1 (diff) | |
| download | ptxdist-b49a596ffdac97822b1f578e46527097b6c5bdff.tar.gz ptxdist-b49a596ffdac97822b1f578e46527097b6c5bdff.tar.xz | |
* sdl.make:
version bump -> 1.2.12
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@7566 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/sdl.make')
| -rw-r--r-- | rules/sdl.make | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/rules/sdl.make b/rules/sdl.make index 0f1bdd232..24a921fed 100644 --- a/rules/sdl.make +++ b/rules/sdl.make @@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_SDL) += sdl # # Paths and names # -SDL_VERSION := 1.2.10 +SDL_VERSION := 1.2.12 SDL := SDL-$(SDL_VERSION) SDL_SUFFIX := tar.gz SDL_URL := http://www.libsdl.org/release/$(SDL).$(SDL_SUFFIX) @@ -300,7 +300,7 @@ sdl_compile: $(STATEDIR)/sdl.compile $(STATEDIR)/sdl.compile: $(sdl_compile_deps_default) @$(call targetinfo, $@) - cd $(SDL_DIR) && $(SDL_ENV) $(SDL_PATH) make + cd $(SDL_DIR) && $(SDL_ENV) $(SDL_PATH) $(MAKE) $(PARALLELMFLAGS) @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -312,13 +312,10 @@ sdl_install: $(STATEDIR)/sdl.install $(STATEDIR)/sdl.install: $(sdl_install_deps_default) @$(call targetinfo, $@) @$(call install, SDL) - # install sdl-config in bin dir - mkdir -p $(PTXCONF_CROSS_PREFIX)/bin + cp $(SDL_DIR)/sdl-config $(PTXCONF_CROSS_PREFIX)/bin/sdl-config chmod a+x $(PTXCONF_CROSS_PREFIX)/bin/sdl-config - # install sdl.pc package config file - mkdir -p $(SYSROOT)/usr/lib/pkgconfig/ - cp $(SDL_DIR)/sdl.pc $(SYSROOT)/usr/lib/pkgconfig/ + @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -341,15 +338,15 @@ $(STATEDIR)/sdl.targetinstall: $(sdl_targetinstall_deps_default) ifdef PTXCONF_SDL_SHARED @$(call install_copy, sdl, 0, 0, 0644, \ - $(SDL_DIR)/build/.libs/libSDL-1.2.so.0.7.3, \ - /usr/lib/libSDL-1.2.so.0.7.3) + $(SDL_DIR)/build/.libs/libSDL-1.2.so.0.11.1, \ + /usr/lib/libSDL-1.2.so.0.11.1) @$(call install_link, sdl, \ - libSDL-1.2.so.0.7.3, \ + libSDL-1.2.so.0.11.1, \ /usr/lib/libSDL-1.2.so.0) @$(call install_link, sdl, \ - libSDL-1.2.so.0.7.3, \ + libSDL-1.2.so.0.11.1, \ /usr/lib/libSDL-1.2.so) endif |