summaryrefslogtreecommitdiffstats
path: root/Samples/OculusWorldDemo
diff options
context:
space:
mode:
authorBrad Davis <[email protected]>2013-08-16 23:21:37 -0700
committerBrad Davis <[email protected]>2013-08-16 23:21:37 -0700
commit78bc5dba1202a0383fd355505c2257d120953e58 (patch)
tree35af2c50b6315c6d338fe3b0bf0cac455de2ae7a /Samples/OculusWorldDemo
parentf29e505a7df820e1376d97b41515bdc89d472499 (diff)
Additional official SDK files from the linux distribution
Diffstat (limited to 'Samples/OculusWorldDemo')
-rw-r--r--Samples/OculusWorldDemo/Makefile14
1 files changed, 11 insertions, 3 deletions
diff --git a/Samples/OculusWorldDemo/Makefile b/Samples/OculusWorldDemo/Makefile
index c5588bc..6015560 100644
--- a/Samples/OculusWorldDemo/Makefile
+++ b/Samples/OculusWorldDemo/Makefile
@@ -49,25 +49,33 @@ DEFINES = -DQT_WEBKIT -DGL_GLEXT_PROTOTYPES
DEBUG = 0
ifeq ($(DEBUG), 1)
CXXFLAGS = -pipe -DDEBUG -g $(DEFINES)
+ LFLAGS =
RELEASETYPE = Debug
else
CXXFLAGS = -pipe -O2 $(DEFINES)
+ LFLAGS = -O1
RELEASETYPE = Release
endif
-####### Compiler, tools and options
+####### Paths
LIBOVRPATH = ../../LibOVR
COMMONSRCPATH = ../CommonSrc
3RDPARTYPATH = ../../3rdParty
INCPATH = -I. -I.. -I$(COMMONSRCPATH) -I$(LIBOVRPATH)/Include -I$(LIBOVRPATH)/Src
OBJPATH = ./Obj/Linux/$(RELEASETYPE)/$(SYSARCH)
-LFLAGS = -Wl -O1 -L$(LIBOVRPATH)/Lib/Linux/$(RELEASETYPE)/$(SYSARCH)
-LIBS = $(SUBLIBS) -lovr -ludev -lpthread -lGL -lX11 -lXinerama
CXX_BUILD = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJPATH)/
####### Files
+LIBS = -L$(LIBOVRPATH)/Lib/Linux/$(RELEASETYPE)/$(SYSARCH) \
+ -lovr \
+ -ludev \
+ -lpthread \
+ -lGL \
+ -lX11 \
+ -lXinerama
+
OBJECTS = $(OBJPATH)/OculusWorldDemo.o \
$(OBJPATH)/Player.o \
$(OBJPATH)/Platform.o \