Commit cf0038ca authored by hybrid's avatar hybrid

Add 64bit linux check for proper library selection.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1328 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 827a3c68
...@@ -60,6 +60,11 @@ CXXFLAGS += -pg ...@@ -60,6 +60,11 @@ CXXFLAGS += -pg
endif endif
CFLAGS := -fexpensive-optimizations -O3 -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES CFLAGS := -fexpensive-optimizations -O3 -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
#multilib handling
ifeq ($(HOSTTYPE), x86_64)
LIBSELECT=64
endif
#Linux specific options #Linux specific options
STATIC_LIB = libIrrlicht.a STATIC_LIB = libIrrlicht.a
SHARED_LIB = libIrrlicht.so SHARED_LIB = libIrrlicht.so
...@@ -68,7 +73,7 @@ LIB_PATH = ../../lib/$(SYSTEM) ...@@ -68,7 +73,7 @@ LIB_PATH = ../../lib/$(SYSTEM)
INSTALL_DIR = /usr/local/lib INSTALL_DIR = /usr/local/lib
staticlib sharedlib install: SYSTEM = Linux staticlib sharedlib install: SYSTEM = Linux
staticlib sharedlib : LDFLAGS = --no-export-all-symbols --add-stdcall-alias staticlib sharedlib : LDFLAGS = --no-export-all-symbols --add-stdcall-alias
sharedlib : LDFLAGS += -L/usr/X11R6/lib -lGL -lXxf86vm sharedlib : LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
staticlib sharedlib : CXXINCS += -I/usr/X11R6/include staticlib sharedlib : CXXINCS += -I/usr/X11R6/include
#Windows specific options #Windows specific options
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment