diff options
| author | Stefan Gartner <stefang@aon.at> | 2003-07-18 14:11:40 +0400 |
|---|---|---|
| committer | Stefan Gartner <stefang@aon.at> | 2003-07-18 14:11:40 +0400 |
| commit | 90f325ea6e58a7599da1efd9c7738253cc6c2bf0 (patch) | |
| tree | 6359a0eca7c5b9a867804f615341fbd3324cae0b /source/nan_link.mk | |
| parent | 93c9ed32b7677fe426188c420055738f75b146e7 (diff) | |
some sdl related stuff:
* moved references to libSDL out of ifeq($(INTERNATIONAL), true) (win32)
and ifeq($(WITH_FREETYPE2),true) (irix) conditionals in source/Makefile
* look for sdl in $(LCGDIR)/sdl if sdl-config isn't found
thanks to LarstiQ for doing most of the work
Diffstat (limited to 'source/nan_link.mk')
| -rw-r--r-- | source/nan_link.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/nan_link.mk b/source/nan_link.mk index 73278b51f8a..fdaf44c59d1 100644 --- a/source/nan_link.mk +++ b/source/nan_link.mk @@ -57,10 +57,8 @@ endif ifeq ($(OS),darwin) LLIBS += -lGLU -lGL - LLIBS += -lz -framework Carbon -framework AGL - ifeq ($(WITH_QUICKTIME), true) - LLIBS += -framework QuickTime - endif + LLIBS += -lz -framework Carbon -framework AGL + LLIBS += -framework QuickTime LDFLAGS += -L/System/Library/Frameworks/OpenGL.framework/Libraries DBG_LDFLAGS += -L/System/Library/Frameworks/OpenGL.framework/Libraries endif @@ -150,6 +148,6 @@ ifeq ($(OS),windows) endif endif -ifneq ($(OS),irix) +ifneq ($(OS), irix) LLIBS += $(NAN_SDLLIBS) endif |