# HG changeset patch # User John Tsiombikas # Date 1421211501 -7200 # Node ID e01da1033ca5107e2e2b4fbb61fea2958c7be077 # Parent bd36c61436faa64a8b676bdaa8f2a442490c76ee first wave of modifications diff -r bd36c61436fa -r e01da1033ca5 LibOVR/Makefile --- a/LibOVR/Makefile Wed Jan 14 06:51:30 2015 +0200 +++ b/LibOVR/Makefile Wed Jan 14 06:58:21 2015 +0200 @@ -74,9 +74,19 @@ STATIC_TARGET = $(TARGET_DIR)/$(STATIC_NAME) LIBOVR_INST_HDR = Src/OVR_CAPI.h Src/OVR_CAPI_Keys.h Src/OVR_CAPI_GL.h +SHARED_BASE = libovr.so +SHARED_SONAME = $(SHARED_BASE).$(SHARED_MAJOR) +SHARED_NAME = $(SHARED_BASE).$(SHARED_MAJOR).$(SHARED_MINOR).$(SHARED_RELEASE) +SHARED_TARGET = $(TARGET_DIR)/$(SHARED_NAME) +SHARED_MAJOR = 0 +SHARED_MINOR = 2 +SHARED_RELEASE = 1 + +LIBOVR_INST_HDR = Src/OVR_CAPI.h Src/OVR_CAPI_Keys.h Src/OVR_CAPI_GL.h + ####### Rules -all: $(STATIC_TARGET) +all: $(STATIC_TARGET) $(SHARED_TARGET) OTHER_SOURCE = $(3RDPARTYPATH)/EDID/edid.cpp \ $(3RDPARTYPATH)/TinyXml/tinyxml2.cpp @@ -151,6 +161,25 @@ @mkdir -p $(@D) ar rvs $(STATIC_TARGET) $(OBJECTS) +$(SHARED_TARGET): $(OBJECTS) + @mkdir -p $(@D) + $(CXX) -shared -Wl,-soname,$(SHARED_SONAME) -o $@ $(OBJECTS) $(LDFLAGS) + clean: -$(DELETEFILE) $(OBJECTS) -$(DELETEFILE) $(STATIC_TARGET) + -$(DELETEFILE) $(SHARED_TARGET) + + +install: $(SHARED_TARGET) $(STATIC_TARGET) + mkdir -p $(DESTDIR)$(PREFIX)/include $(DESTDIR)$(PREFIX)/lib + cp $(LIBOVR_INST_HDR) $(DESTDIR)$(PREFIX)/include + cp $(STATIC_TARGET) $(SHARED_TARGET) $(DESTDIR)$(PREFIX)/lib + cd $(DESTDIR)$(PREFIX)/lib && \ + rm -f $(SHARED_BASE) $(SHARED_SONAME) && \ + ln -s $(SHARED_NAME) $(SHARED_SONAME) && \ + ln -s $(SHARED_SONAME) $(SHARED_BASE) + +uninstall: + -cd $(DESTDIR)$(PREFIX)/include && rm -f $(LIBOVR_INST_HDR) + -cd $(DESTDIR)$(PREFIX)/lib && rm -f $(SHARED_BASE) $(SHARED_SONAME) $(SHARED_NAME) diff -r bd36c61436fa -r e01da1033ca5 Makefile --- a/Makefile Wed Jan 14 06:51:30 2015 +0200 +++ b/Makefile Wed Jan 14 06:58:21 2015 +0200 @@ -63,6 +63,7 @@ export DEBUG ####### Target settings +PREFIX = /usr/local LIBOVRPATH = ./LibOVR OWDPATH = ./Samples/OculusWorldDemo @@ -86,6 +87,15 @@ $(MAKE) -C $(LIBOVRPATH) clean $(MAKE) -C $(OWDPATH) clean +install: oculusd + mkdir -p $(DESTDIR)$(PREFIX)/bin + cp oculusd $(DESTDIR)$(PREFIX)/bin/oculusd + $(MAKE) -C $(LIBOVRPATH) install + +uninstall: + rm $(DESTDIR)$(PREFIX)/bin/oculusd + $(MAKE) -C $(LIBOVRPATH) uninstall + force_look: true