1.1 --- a/Makefile	Fri Aug 30 06:08:34 2013 +0300
     1.2 +++ b/Makefile	Sat Sep 14 16:14:59 2013 +0300
     1.3 @@ -1,16 +1,26 @@
     1.4  src = $(wildcard src/*.cc)
     1.5 -obj = $(src:.cc=.o)
     1.6 +ovr_src = $(wildcard libovr/Src/*.cpp) \
     1.7 +		  $(wildcard libovr/Src/Kernel/*.cpp) \
     1.8 +		  $(wildcard libovr/Src/Util/*.cpp)
     1.9 +
    1.10 +obj = $(src:.cc=.o) $(ovr_src:.cpp=.o) $(ovr_sys_src:.cpp=.o)
    1.11  bin = oculus1
    1.12  
    1.13 -CXXFLAGS = -pedantic -Wall -g -I/usr/local/include
    1.14 +
    1.15 +CXXFLAGS = -Wall -g -I/usr/local/include $(ovr_include) -DUSE_OVR
    1.16  LDFLAGS = -L/usr/local/lib $(libgl) $(ovrlibs) -lm
    1.17  
    1.18  ifeq ($(shell uname -s), Darwin)
    1.19  	libgl = -framework OpenGL -framework GLUT -lGLEW
    1.20 -	ovrlibs = -lovr -framework CoreFoundation -framework ApplicationServices -framework IOKit
    1.21 +	ovrlibs = -framework CoreFoundation -framework ApplicationServices -framework IOKit
    1.22 +
    1.23 +	ovr_include = -Ilibovr/Include -Ilibovr/Src -Ilibovr/Src/osx
    1.24 +	ovr_sys_src = $(wildcard libovr/Src/osx/*.cpp)
    1.25  else
    1.26  	libgl = -lGL -lGLU -lglut -lGLEW
    1.27 -	ovrlibs = -lovr
    1.28 +
    1.29 +	ovr_include = -Ilibovr/Include -Ilibovr/Src -Ilibovr/Src/linux
    1.30 +	ovr_sys_src = $(wildcard libovr/Src/linux/*.cpp)
    1.31  endif
    1.32  
    1.33  $(bin): $(obj)