Commit f56fd93a authored by hybrid's avatar hybrid

Fix make install.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2413 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 124e9402
...@@ -74,7 +74,7 @@ STATIC_LIB = libIrrlicht.a ...@@ -74,7 +74,7 @@ STATIC_LIB = libIrrlicht.a
IRRLICHT_DLL := ../../bin/Win32-gcc/Irrlicht.dll IRRLICHT_DLL := ../../bin/Win32-gcc/Irrlicht.dll
LIB_PATH = ../../lib/$(SYSTEM) LIB_PATH = ../../lib/$(SYSTEM)
INSTALL_DIR = /usr/local/lib INSTALL_DIR = /usr/local/lib
sharedlib: SHARED_LIB = libIrrlicht.so sharedlib install: SHARED_LIB = libIrrlicht.so
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$(LIBSELECT) -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
...@@ -83,7 +83,7 @@ staticlib sharedlib: CXXINCS += -I/usr/X11R6/include ...@@ -83,7 +83,7 @@ staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX
staticlib_osx sharedlib_osx: IRROTHEROBJ += MacOSX/CIrrDeviceMacOSX.o MacOSX/OSXClipboard.o MacOSX/AppDelegate.o staticlib_osx sharedlib_osx: IRROTHEROBJ += MacOSX/CIrrDeviceMacOSX.o MacOSX/OSXClipboard.o MacOSX/AppDelegate.o
staticlib_osx sharedlib_osx: CXXINCS += -IMacOSX -I/usr/X11R6/include staticlib_osx sharedlib_osx: CXXINCS += -IMacOSX -I/usr/X11R6/include
sharedlib_osx: SHARED_LIB = libIrrlicht.dylib sharedlib_osx install_osx: SHARED_LIB = libIrrlicht.dylib
staticlib_osx sharedlib_osx: LDFLAGS = --no-export-all-symbols --add-stdcall-alias staticlib_osx sharedlib_osx: LDFLAGS = --no-export-all-symbols --add-stdcall-alias
sharedlib_osx: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm sharedlib_osx: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
...@@ -119,18 +119,24 @@ sharedlib_win32: $(IRRLICHT_DLL) ...@@ -119,18 +119,24 @@ sharedlib_win32: $(IRRLICHT_DLL)
staticlib_win32: $(STATIC_LIB) staticlib_win32: $(STATIC_LIB)
cp $^ $(LIB_PATH) cp $^ $(LIB_PATH)
# Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into /lib/Linux # Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into /lib/MacOSX
sharedlib_osx: $(LINKOBJ) sharedlib_osx: $(LINKOBJ)
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -dynamiclib -Wl,-install_name,$(SHARED_LIB).1 -fPIC -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS) $(CXX) $(CPPFLAGS) $(CXXFLAGS) -dynamiclib -Wl,-install_name,$(SHARED_LIB).1 -fPIC -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS)
cp $(SHARED_LIB).$(VERSION) $(LIB_PATH) cp $(SHARED_LIB).$(VERSION) $(LIB_PATH)
# Installs Irrlicht if it was created as shared lib # Installs Irrlicht if it was created as shared lib
install: install:
$(RM) -r $(INSTALL_DIR)/../include/irrlicht
mkdir -p $(INSTALL_DIR)/../include/irrlicht
cp -r ../../include $(INSTALL_DIR)/../include/irrlicht
cp $(LIB_PATH)/$(SHARED_LIB).$(VERSION) $(INSTALL_DIR) cp $(LIB_PATH)/$(SHARED_LIB).$(VERSION) $(INSTALL_DIR)
cd $(INSTALL_DIR) && ln -s libIrrlicht.so.$(VERSION) $(SHARED_LIB) cd $(INSTALL_DIR) && ln -s libIrrlicht.so.$(VERSION) $(SHARED_LIB)
ldconfig -n $(INSTALL_DIR) ldconfig -n $(INSTALL_DIR)
install_osx: install_osx:
$(RM) -r $(INSTALL_DIR)/../include/irrlicht
mkdir -p $(INSTALL_DIR)/../include/irrlicht
cp -r ../../include $(INSTALL_DIR)/../include/irrlicht
cp $(LIB_PATH)/$(SHARED_LIB).$(VERSION) $(INSTALL_DIR) cp $(LIB_PATH)/$(SHARED_LIB).$(VERSION) $(INSTALL_DIR)
cd $(INSTALL_DIR) && ln -s libIrrlicht.dylib.$(VERSION) $(SHARED_LIB) cd $(INSTALL_DIR) && ln -s libIrrlicht.dylib.$(VERSION) $(SHARED_LIB)
ldconfig -n $(INSTALL_DIR) ldconfig -n $(INSTALL_DIR)
......
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