Linux compatibility.

Makefile

@@ -1,3 +1,7 @@
+
+MACHINE= $(shell uname -s)
+
+ifeq ($(MACHINE),Darwin)
 CXXFLAGS = \
 	-O2 \
 	-I/System/Library/Frameworks/GLUT.framework/Headers \
@@ -24,8 +28,29 @@ RESOURCES = \
 	resources/*.png \
 	resources/*.vert \
 	resources/world.xml
+
+else
+LIBS = \
+	`sdl-config --cflags` \
+	-I/usr/include \
+	-lGLU \
+	-lGL \
+	-lGLEW \
+	-lglut \
+	-lSDL \
+	-lSDL_image \
+	-lSDL_mixer \
+	-ltinyxml
+
+endif
 
+ifeq ($(MACHINE),Darwin)
 all : obj/Polly-B-Gone.app
+else
+all : obj/polly-b-gone
+endif
+
+ifeq ($(MACHINE),Darwin)
 
 obj/main.out : \
 	obj/ball.o \
@@ -66,6 +91,48 @@ obj/main.out : \
 	obj/worlds.o \
 	src/SDLMain.m
 
+else
+
+obj/main.out : \
+	obj/ball.o \
+	obj/block.o \
+	obj/escalator.o \
+	obj/fan.o \
+	obj/lighting.o \
+	obj/material.o \
+	obj/model.o \
+	obj/physics/constraint.o \
+	obj/physics/force.o \
+	obj/physics/particle.o \
+	obj/physics/rotation.o \
+	obj/physics/shape.o \
+	obj/physics/transform.o \
+	obj/physics/translation.o \
+	obj/physics/vector.o \
+	obj/player.o \
+	obj/portal.o \
+	obj/ramp.o \
+	obj/resource.o \
+	obj/room.o \
+	obj/room_force.o \
+	obj/room_object.o \
+	obj/rotating.o \
+	obj/seesaw.o \
+	obj/shader.o \
+	obj/simulation.o \
+	obj/sound.o \
+	obj/switch.o \
+	obj/texture.o \
+	obj/trail.o \
+	obj/transforming.o \
+	obj/translating.o \
+	obj/tube.o \
+	obj/wall.o \
+	obj/world.o \
+	obj/worlds.o
+
+endif
+
 obj/physics/particle_test.out : \
 	obj/physics/force.o \
 	obj/physics/particle.o \
@@ -79,6 +146,8 @@ obj/physics/shape_test.out : \
 obj/physics/vector_test.out : \
 	obj/physics/vector.o
 
+ifeq ($(MACHINE),Darwin)
+
 obj/Polly-B-Gone.app : obj/main.out $(RESOURCES) resources/Info.plist Makefile
 	rm -rf $@
 	mkdir -p $@/Contents/MacOS
@@ -94,8 +163,17 @@ obj/Polly-B-Gone.app : obj/main.out $(RESOURCES) resources/Info.plist Makefile
 	find $@/Contents/Frameworks -name Headers | xargs rm -r
 #	ln -sf ../../../../resources/world.xml $@/Contents/Resources/world.xml
 
+else
+obj/polly-b-gone : obj/main.out
+	mv obj/main.out polly-b-gone
+endif
+
 obj/%.out : obj/%.o
+ifeq ($(MACHINE),Darwin)
 	$(CXX) $(LDFLAGS) -o $@ $^
+else
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+endif
 
 obj/%.o : src/%.cpp
 	mkdir -p $(@D)

src/lighting.h

@@ -3,7 +3,11 @@
 #ifndef MBOSTOCK_LIGHTING_H
 #define MBOSTOCK_LIGHTING_H
 
-#include <OpenGL/gl.h>
+#ifdef __APPLE__
+  #include <OpenGL/gl.h>
+#else
+  #include <GL/gl.h>
+#endif
 
 namespace mbostock {
 

src/main.cpp

@@ -1,11 +1,21 @@
 // -*- C++ -*-
 
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
+#ifdef __APPLE__
+  #include <OpenGL/gl.h>
+  #include <OpenGL/glu.h>
+#else
+  #include <GL/gl.h>
+  #include <GL/glu.h>
+  #include <GL/glut.h>
+#endif
 #include <SDL/SDL.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <TinyXML/tinyxml.h>
+#ifdef __APPLE__
+  #include <TinyXML/tinyxml.h>
+#else
+  #include <tinyxml.h>
+#endif
 
 #include "room.h"
 #include "shader.h"
@@ -116,19 +126,31 @@ static void toggleFullScreen() {
 static void handleKeyDown(SDL_Event* event) {
   switch (event->key.keysym.sym) {
     case SDLK_LEFT: {
+#ifdef __APPLE__
       if (event->key.keysym.mod & KMOD_META) {
+#else
+      if (event->key.keysym.mod & KMOD_CTRL) {
+#endif
         world->previousRoom();
       }
       break;
     }
     case SDLK_DOWN: {
+#ifdef __APPLE__
       if (event->key.keysym.mod & KMOD_META) {
+#else
+      if (event->key.keysym.mod & KMOD_CTRL) {
+#endif
         world->resetPlayer();
       }
       break;
     }
     case SDLK_RIGHT: {
+#ifdef __APPLE__
       if (event->key.keysym.mod & KMOD_META) {
+#else
+      if (event->key.keysym.mod & KMOD_CTRL) {
+#endif
         world->nextRoom();
       }
       break;
@@ -192,6 +214,11 @@ static void eventLoop() {
 }
 
 int main(int argc, char** argv) {
+
+#ifndef __APPLE__
+  glutInit(&argc, argv);
+#endif
+
   SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO);
 
   SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, 1);

src/material.cpp

@@ -1,6 +1,10 @@
 // -*- C++ -*-
 
-#include <OpenGL/gl.h>
+#ifdef __APPLE__
+  #include <OpenGL/gl.h>
+#else
+  #include <GL/gl.h>
+#endif
 #include <iostream>
 #include <math.h>
 #include <stdlib.h>

src/model.cpp

@@ -1,7 +1,12 @@
 // -*- C++ -*-
 
-#include <GLUT/glut.h>
-#include <OpenGL/glu.h>
+#ifdef __APPLE__
+  #include <GLUT/glut.h>
+  #include <OpenGL/glu.h>
+#else
+  #include <GL/glut.h>
+  #include <GL/glu.h>
+#endif
 #include <algorithm>
 #include <iostream>
 #include <math.h>

src/model.h

@@ -3,7 +3,11 @@
 #ifndef MBOSTOCK_MODEL_H
 #define MBOSTOCK_MODEL_H
 
-#include <OpenGL/glu.h>
+#ifdef __APPLE__
+  #include <OpenGL/glu.h>
+#else
+  #include <GL/glu.h>
+#endif
 
 #include "physics/shape.h"
 #include "physics/vector.h"

src/player.cpp

@@ -1,8 +1,14 @@
 // -*- C++ -*-
 
-#include <GLUT/glut.h>
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
+#ifdef __APPLE__
+  #include <GLUT/glut.h>
+  #include <OpenGL/gl.h>
+  #include <OpenGL/glu.h>
+#else
+  #include <GL/glut.h>
+  #include <GL/gl.h>
+  #include <GL/glu.h>
+#endif
 #include <iostream>
 #include <math.h>
 #include <stdio.h>

src/resource.cpp

@@ -9,7 +9,11 @@
 using namespace mbostock;
 
 const char* Resources::path() {
-  return "Contents/Resources/";
+#ifdef __APPLE__
+   return "Contents/Resources/";
+#else
+  return "resources/";
+#endif
 }
 
 const char* Resources::readFile(const char* p) {

src/seesaw.cpp

@@ -1,6 +1,10 @@
 // -*- C++ -*-
 
-#include <OpenGL/gl.h>
+#ifdef __APPLE__
+  #include <OpenGL/gl.h>
+#else
+  #include <GL/gl.h>
+#endif
 
 #include "material.h"
 #include "physics/constraint.h"

src/shader.cpp

@@ -1,6 +1,9 @@
 // -*- C++ -*-
 
 #include <stdlib.h>
+#ifndef __APPLE__
+  #include <GL/glew.h>
+#endif
 
 #include "model.h"
 #include "resource.h"

src/shader.h

@@ -3,7 +3,11 @@
 #ifndef _SHADER_H
 #define _SHADER_H
 
-#include <OpenGL/gl.h>
+#ifdef __APPLE__
+  #include <OpenGL/gl.h>
+#else
+  #include <GL/gl.h>
+#endif
 
 namespace mbostock {
 

src/simulation.cpp

@@ -1,6 +1,10 @@
 // -*- C++ -*-
 
-#include <SDL/sdl.h>
+#ifdef __APPLE_
+  #include <SDL/sdl.h>
+#else
+  #include <SDL/SDL.h>
+#endif
 
 #include "simulation.h"
 

src/sound.cpp

@@ -1,7 +1,12 @@
 // -*- C++ -*-
 
-#include <SDL/SDL_error.h>
-#include <SDL_mixer/SDL_mixer.h>
+#ifdef __APPLE__
+  #include <SDL/SDL_error.h>
+  #include <SDL_mixer/SDL_mixer.h>
+#else
+  #include <SDL/SDL_error.h>
+  #include <SDL/SDL_mixer.h>
+#endif
 #include <iostream>
 #include <string>
 #include <vector>

src/texture.cpp

@@ -1,9 +1,16 @@
 // -*- C++ -*-
 
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
-#include <SDL/sdl.h>
-#include <SDL_image/SDL_image.h>
+#ifdef __APPLE__
+  #include <OpenGL/gl.h>
+  #include <OpenGL/glu.h>
+  #include <SDL/sdl.h>
+  #include <SDL_image/SDL_image.h>
+#else
+  #include <GL/gl.h>
+  #include <GL/glu.h>
+  #include <SDL/SDL.h>
+  #include <SDL/SDL_image.h>
+#endif
 #include <iostream>
 #include <string>
 #include <vector>

src/texture.h

@@ -3,7 +3,11 @@
 #ifndef MBOSTOCK_TEXTURE_H
 #define MBOSTOCK_TEXTURE_H
 
-#include <OpenGL/gl.h>
+#ifdef __APPLE__
+  #include <OpenGL/gl.h>
+#else
+  #include <GL/gl.h>
+#endif
 
 namespace mbostock {
 

src/world.cpp

@@ -1,6 +1,10 @@
 // -*- C++ -*-
 
-#include <OpenGL/gl.h>
+#ifdef __APPLE__
+  #include <OpenGL/gl.h>
+#else
+  #include <GL/gl.h>
+#endif
 
 #include "material.h"
 #include "portal.h"

src/worlds.cpp

@@ -1,4 +1,11 @@
-#include <TinyXML/tinyxml.h>
+#ifdef __APPLE__
+  #include <TinyXML/tinyxml.h>
+#else
+#ifndef TIXML_USE_STL
+  #define TIXML_USE_STL
+#endif
+  #include <tinyxml.h>
+#endif
 #include <iostream>
 #include <list>
 #include <map>