Changeset 676 for trunk/kBuild/sdks


Ignore:
Timestamp:
Dec 7, 2006, 3:56:34 AM (19 years ago)
Author:
bird
Message:

Some adjustments to the SDL stuff, only one default library for instance.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/sdks/LIBSDL.kmk

    r664 r676  
    4848#
    4949ifeq ($(BUILD_TARGET),os2)
    50  SDK_LIBSDL_LIBMAIN ?=
     50 LIB_SDK_LIBSDL_SDLMAIN  ?=
     51 DLL_SDK_LIBSDL_SDL      ?= $(PATH_SDK_LIBSDL)/SDL/SDL12.dll
     52 LIB_SDK_LIBSDL_SDL      ?= $(PATH_SDK_LIBSDL)/SDL/SDL12.lib
     53 LIB_SDK_LIBSDL_SDLGFX   ?= $(PATH_SDK_LIBSDL)/SDLGfx/SDLGFX.lib
     54 LIB_SDK_LIBSDL_SDLIMAGE ?= $(PATH_SDK_LIBSDL)/SDLImage/SDLIMAGE.lib
     55 LIB_SDK_LIBSDL_SDLMIXER ?= $(PATH_SDK_LIBSDL)/SDLMixer/SDLMIXER.lib
     56 LIB_SDK_LIBSDL_SDLNET   ?= $(PATH_SDK_LIBSDL)/SDLNet/SDLNET.lib
     57 LIB_SDK_LIBSDL_SDLTTF   ?= $(PATH_SDK_LIBSDL)/SDLTTF/SDLTTF.lib
    5158
    5259 # General Properties used by kBuild
    … …  
    5966        $(PATH_SDK_LIBSDL)/SDLTTF
    6067 SDK_LIBSDL_LIBS ?= \
    61         $(PATH_SDK_LIBSDL)/SDL/SDL12.lib \
    62         $(PATH_SDK_LIBSDL)/SDLGfx/SDLGFX.lib \
    63         $(PATH_SDK_LIBSDL)/SDLImage/SDLIMAGE.lib \
    64         $(PATH_SDK_LIBSDL)/SDLMixer/SDLMIXER.lib \
    65         $(PATH_SDK_LIBSDL)/SDLNet/SDLNET.lib \
    66         $(PATH_SDK_LIBSDL)/SDLTTF/SDLTTF.lib
     68        $(LIB_SDK_LIBSDL_SDL)
    6769 SDK_LIBSDL_LIBPATHS ?= \
    6870        $(PATH_SDK_LIBSDL)/SDL \
    … …  
    7577else
    7678 ifeq ($(BUILD_TARGET),win) # ASSUMES VC++ on windows, sorry.
    77   SDK_LIBSDL_LIBMAIN ?= \
    78         $(PATH_SDK_LIBSDL)/lib/SDLmain.lib
     79  LIB_SDK_LIBSDL_SDLMAIN  ?= $(PATH_SDK_LIBSDL)/lib/SDLmain.lib
     80  LIB_SDK_LIBSDL_SDL      ?= $(PATH_SDK_LIBSDL)/lib/SDL.lib
     81  DLL_SDK_LIBSDL_SDL      ?= $(PATH_SDK_LIBSDL)/lib/SDL.dll
     82  LIB_SDK_LIBSDL_SDLGFX   ?= $(PATH_SDK_LIBSDL)/lib/SDLGFX.lib
     83  LIB_SDK_LIBSDL_SDLIMAGE ?= $(PATH_SDK_LIBSDL)/lib/SDLIMAGE.lib
     84  LIB_SDK_LIBSDL_SDLMIXER ?= $(PATH_SDK_LIBSDL)/lib/SDLMIXER.lib
     85  LIB_SDK_LIBSDL_SDLNET   ?= $(PATH_SDK_LIBSDL)/lib/SDLNET.lib
     86  LIB_SDK_LIBSDL_SDLTTF   ?= $(PATH_SDK_LIBSDL)/lib/SDLTTF.lib
     87  DLL_SDK_LIBSDL_SDLTTF   ?= $(PATH_SDK_LIBSDL)/lib/SDL_ttf.dll
    7988
    8089  # General Properties used by kBuild
    … …  
    8392        $(PATH_SDK_LIBSDL)/include
    8493  SDK_LIBSDL_LIBS ?= \
    85         $(PATH_SDK_LIBSDL)/lib/SDL.lib
    86   SDK_LIBSDL_LIBPATHS?= \
     94        $(LIB_SDK_LIBSDL_SDL)
     95  SDK_LIBSDL_LIBPATHS ?= \
    8796        $(PATH_SDK_LIBSDL)/lib
    8897
    8998 else # ASSUMES Unix like system
    90   SDK_LIBSDL_LIBMAIN ?= sdlmain
     99  LIB_SDK_LIBSDL_SDLMAIN  ?= sdlmain
     100  LIB_SDK_LIBSDL_SDL      ?= sdl
     101  LIB_SDK_LIBSDL_SDLGFX   ?= sdlgfx
     102  LIB_SDK_LIBSDL_SDLIMAGE ?= sdlimage
     103  LIB_SDK_LIBSDL_SDLMIXER ?= sdlmixer
     104  LIB_SDK_LIBSDL_SDLNET   ?= sdlnet
     105  LIB_SDK_LIBSDL_SDLTTF   ?= sdlttf
    91106
    92107  # General Properties used by kBuild
    … …  
    94109        $(PATH_SDK_LIBSDL)/include/SDL \
    95110        $(PATH_SDK_LIBSDL)/include
    96   SDK_LIBSDL_LIBS ?= sdl sdlgfx sdlimage sdlmixer sdlnet sdlttf
     111  SDK_LIBSDL_LIBS ?= \
     112        $(LIB_SDK_LIBSDL_SDL)
    97113  SDK_LIBSDL_LIBPATHS ?= \
    98114        $(PATH_SDK_LIBSDL)/lib
Note: See TracChangeset for help on using the changeset viewer.