Changeset 707 for trunk/kBuild

Timestamp:

Dec 11, 2006, 10:59:03 AM (19 years ago)

Author:

bird

Message:

linux fixes.

File:

• trunk/kBuild/sdks/LIBSDL.kmk (modified) (3 diffs)

trunk/kBuild/sdks/LIBSDL.kmk

@@ -38 +38 @@
   # Search in the typical unix places.
   PATH_SDK_LIBSDL := $(firstword $(wildcard \
-        /lib/libsdl.* \
-        /usr/lib/libsdl.* \
-        /usr/local/lib/libsdl.* \
-        /opt/lib/libsdl.* \
-        /opt/local/lib/libsdl.*) )
+        /lib/libSDL.* \
+        /usr/lib/libSDL.* \
+        /usr/local/lib/libSDL.* \
+        /opt/lib/libSDL.* \
+        /opt/local/lib/libSDL.*) )
   ifneq ($(PATH_SDK_LIBSDL),)
-   PATH_SDK_LIBSDL := $(patsubst %/,%,$(dir $(dir PATH_SDK_LIBSDL)))
+   PATH_SDK_LIBSDL := $(patsubst %/,%,$(dir $(patsubst %/,%,$(dir $(PATH_SDK_LIBSDL)))))
   else
    $(warning kBuild: PATH_SDK_LIBSDL couldn't be determined!)
@@ -108 +108 @@
 
  else # ASSUMES Unix like system
-  LIB_SDK_LIBSDL_SDLMAIN  ?= sdlmain
-  LIB_SDK_LIBSDL_SDL      ?= sdl
-  LIB_SDK_LIBSDL_SDLGFX   ?= sdlgfx
-  LIB_SDK_LIBSDL_SDLIMAGE ?= sdlimage
-  LIB_SDK_LIBSDL_SDLMIXER ?= sdlmixer
-  LIB_SDK_LIBSDL_SDLNET   ?= sdlnet
-  LIB_SDK_LIBSDL_SDLTTF   ?= sdlttf
+  LIB_SDK_LIBSDL_SDLMAIN  ?= SDLmain
+  LIB_SDK_LIBSDL_SDL      ?= SDL
+  LIB_SDK_LIBSDL_SDLGFX   ?= SDL_gfx
+  LIB_SDK_LIBSDL_SDLIMAGE ?= SDL_image
+  LIB_SDK_LIBSDL_SDLMIXER ?= SDL_mixer
+  LIB_SDK_LIBSDL_SDLNET   ?= SDL_net
+  LIB_SDK_LIBSDL_SDLTTF   ?= SDL_ttf
 
   # General Properties used by kBuild
-  SDK_LIBSDL_INCS ?= \
-        $(PATH_SDK_LIBSDL)/include/SDL \
-        $(PATH_SDK_LIBSDL)/include
+  ifndef SDK_LIBSDL_INCS
+   ifneq ($(wildcard $(PATH_SDK_LIBSDL)/include/SDL/),)
+    SDK_LIBSDL_INCS := $(PATH_SDK_LIBSDL)/include/SDL
+   else
+    SDK_LIBSDL_INCS := $(PATH_SDK_LIBSDL)/include
+   endif
+  endif
   SDK_LIBSDL_LIBS ?= \
         $(LIB_SDK_LIBSDL_SDL)
@@ -126 +130 @@
  endif
 endif
-