Attachment #186460 for bug #263965

Lines 2-10 Link Here

(-)polly-src.old/lighting.h (-2 / +4 lines)
2		2
3	#ifndef MBOSTOCK_LIGHTING_H	3	#ifndef MBOSTOCK_LIGHTING_H
4	#define MBOSTOCK_LIGHTING_H	4	#define MBOSTOCK_LIGHTING_H
5		5	#ifdef __APPLE__
6	#include <OpenGL/gl.h>	6	#include <OpenGL/gl.h>
7		7	#else
		8	#include <GL/gl.h>
		9	#endif
8	namespace mbostock {	10	namespace mbostock {
9		11
10	class Light {	12	class Light {

Lines 1-11 Link Here

(-)polly-src.old/main.cpp (+17 lines)
1	// -- C++ --	1	// -- C++ --
2		2
		3	#ifdef __APPLE__
3	#include <OpenGL/gl.h>	4	#include <OpenGL/gl.h>
4	#include <OpenGL/glu.h>	5	#include <OpenGL/glu.h>
		6	#else
		7	#include <GL/gl.h>
		8	#include <GL/glu.h>
		9	#include <GL/glut.h>
		10	#endif
		11
5	#include <SDL/SDL.h>	12	#include <SDL/SDL.h>
6	#include <stdio.h>	13	#include <stdio.h>
7	#include <stdlib.h>	14	#include <stdlib.h>
		15
		16	#ifdef __APPLE__
8	#include <TinyXML/tinyxml.h>	17	#include <TinyXML/tinyxml.h>
		18	#else
		19	#include <tinyxml.h>
		20	#endif
9		21
10	#include "room.h"	22	#include "room.h"
11	#include "shader.h"	23	#include "shader.h"
Lines 192-197 Link Here
192	}	204	}
193		205
194	int main(int argc, char** argv) {	206	int main(int argc, char** argv) {
		207
		208	#ifndef __APPLE__
		209	glutInit(&argc, argv);
		210	#endif
		211
195	SDL_Init(SDL_INIT_VIDEO \| SDL_INIT_AUDIO);	212	SDL_Init(SDL_INIT_VIDEO \| SDL_INIT_AUDIO);
196		213
197	SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, 1);	214	SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, 1);

Lines 1-6 Link Here

(-)polly-src.old/material.cpp (-1 / +4 lines)
1	// -- C++ --	1	// -- C++ --
2		2	#ifdef __APPLE__
3	#include <OpenGL/gl.h>	3	#include <OpenGL/gl.h>
		4	#else
		5	#include <GL/gl.h>
		6	#endif
4	#include <iostream>	7	#include <iostream>
5	#include <math.h>	8	#include <math.h>
6	#include <stdlib.h>	9	#include <stdlib.h>

Lines 1-7 Link Here

(-)polly-src.old/model.cpp (-1 / +5 lines)
1	// -- C++ --	1	// -- C++ --
2		2	#ifdef __APPLE__
3	#include <GLUT/glut.h>	3	#include <GLUT/glut.h>
4	#include <OpenGL/glu.h>	4	#include <OpenGL/glu.h>
		5	#else
		6	#include <GL/glut.h>
		7	#include <GL/glu.h>
		8	#endif
5	#include <algorithm>	9	#include <algorithm>
6	#include <iostream>	10	#include <iostream>
7	#include <math.h>	11	#include <math.h>

Lines 2-10 Link Here

(-)polly-src.old/model.h (-2 / +4 lines)
2		2
3	#ifndef MBOSTOCK_MODEL_H	3	#ifndef MBOSTOCK_MODEL_H
4	#define MBOSTOCK_MODEL_H	4	#define MBOSTOCK_MODEL_H
5		5	#ifdef __APPLE__
6	#include <OpenGL/glu.h>	6	#include <OpenGL/glu.h>
7		7	#else
		8	#include <GL/glu.h>
		9	#endif
8	#include "physics/shape.h"	10	#include "physics/shape.h"
9	#include "physics/vector.h"	11	#include "physics/vector.h"
10		12

Lines 1-8 Link Here

(-)polly-src.old/player.cpp (-1 / +6 lines)
1	// -- C++ --	1	// -- C++ --
2		2	#ifdef __APPLE__
3	#include <GLUT/glut.h>	3	#include <GLUT/glut.h>
4	#include <OpenGL/gl.h>	4	#include <OpenGL/gl.h>
5	#include <OpenGL/glu.h>	5	#include <OpenGL/glu.h>
		6	#else
		7	#include <GL/glut.h>
		8	#include <GL/gl.h>
		9	#include <GL/glu.h>
		10	#endif
6	#include <iostream>	11	#include <iostream>
7	#include <math.h>	12	#include <math.h>
8	#include <stdio.h>	13	#include <stdio.h>

Lines 9-15 Link Here

(-)polly-src.old/resource.cpp (+4 lines)
9	using namespace mbostock;	9	using namespace mbostock;
10		10
11	const char* Resources::path() {	11	const char* Resources::path() {
		12	#ifdef __APPLE__
12	return "Contents/Resources/";	13	return "Contents/Resources/";
		14	#else
		15	return "resources/";
		16	#endif
13	}	17	}
14		18
15	const char* Resources::readFile(const char* p) {	19	const char* Resources::readFile(const char* p) {

Lines 1-7 Link Here

(-)polly-src.old/seesaw.cpp (-2 / +4 lines)
1	// -- C++ --	1	// -- C++ --
2		2	#ifdef __APPLE__
3	#include <OpenGL/gl.h>	3	#include <OpenGL/gl.h>
4		4	#else
		5	#include <GL/gl.h>
		6	#endif
5	#include "material.h"	7	#include "material.h"
6	#include "physics/constraint.h"	8	#include "physics/constraint.h"
7	#include "physics/force.h"	9	#include "physics/force.h"

Lines 2-7 Link Here

(-)polly-src.old/shader.cpp (+4 lines)
2		2
3	#include <stdlib.h>	3	#include <stdlib.h>
4		4
		5	#ifndef __APPLE__
		6	#include <GL/glew.h>
		7	#endif
		8
5	#include "model.h"	9	#include "model.h"
6	#include "resource.h"	10	#include "resource.h"
7	#include "shader.h"	11	#include "shader.h"

Lines 3-9 Link Here

(-)polly-src.old/shader.h (+4 lines)
3	#ifndef _SHADER_H	3	#ifndef _SHADER_H
4	#define _SHADER_H	4	#define _SHADER_H
5		5
		6	#ifdef __APPLE__
6	#include <OpenGL/gl.h>	7	#include <OpenGL/gl.h>
		8	#else
		9	#include <GL/gl.h>
		10	#endif
7		11
8	namespace mbostock {	12	namespace mbostock {
9		13

Lines 1-6 Link Here

(-)polly-src.old/simulation.cpp (+4 lines)
1	// -- C++ --	1	// -- C++ --
2		2
		3	#ifdef __APPLE_
3	#include <SDL/sdl.h>	4	#include <SDL/sdl.h>
		5	#else
		6	#include <SDL/SDL.h>
		7	#endif
4		8
5	#include "simulation.h"	9	#include "simulation.h"
6		10

Lines 1-7 Link Here

(-)polly-src.old/sound.cpp (+6 lines)
1	// -- C++ --	1	// -- C++ --
2		2
		3	#ifdef __APPLE__
3	#include <SDL/SDL_error.h>	4	#include <SDL/SDL_error.h>
4	#include <SDL_mixer/SDL_mixer.h>	5	#include <SDL_mixer/SDL_mixer.h>
		6	#else
		7	#include <SDL/SDL_error.h>
		8	#include <SDL/SDL_mixer.h>
		9	#endif
		10
5	#include <iostream>	11	#include <iostream>
6	#include <string>	12	#include <string>
7	#include <vector>	13	#include <vector>




// -*- C++ -*-

#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>

Lines 2-10 Link Here

(-)polly-src.old/texture.h (-2 / +4 lines)
2		2
3	#ifndef MBOSTOCK_TEXTURE_H	3	#ifndef MBOSTOCK_TEXTURE_H
4	#define MBOSTOCK_TEXTURE_H	4	#define MBOSTOCK_TEXTURE_H
5		5	#ifdef __APPLE__
6	#include <OpenGL/gl.h>	6	#include <OpenGL/gl.h>
7		7	#else
		8	#include <GL/gl.h>
		9	#endif
8	namespace mbostock {	10	namespace mbostock {
9		11
10	class Texture {	12	class Texture {

Lines 1-6 Link Here

(-)polly-src.old/world.cpp (+4 lines)
1	// -- C++ --	1	// -- C++ --
2		2
		3	#ifdef __APPLE__
3	#include <OpenGL/gl.h>	4	#include <OpenGL/gl.h>
		5	#else
		6	#include <GL/gl.h>
		7	#endif
4		8
5	#include "material.h"	9	#include "material.h"
6	#include "portal.h"	10	#include "portal.h"

Lines 1-4 Link Here

(-)polly-src.old/worlds.cpp (+8 lines)
		1	#ifdef __APPLE__
1	#include <TinyXML/tinyxml.h>	2	#include <TinyXML/tinyxml.h>
		3	#else
		4	#ifndef TIXML_USE_STL
		5	#define TIXML_USE_STL
		6	#endif
		7	#include <tinyxml.h>
		8	#endif
		9
2	#include <iostream>	10	#include <iostream>
3	#include <list>	11	#include <list>
4	#include <map>	12	#include <map>

Return to bug 263965

Lines 1-9 Link Here

(-)polly-src.old/texture.cpp (+8 lines)
1	// -- C++ --	1	// -- C++ --
2		2
		3	#ifdef __APPLE__
3	#include <OpenGL/gl.h>	4	#include <OpenGL/gl.h>
4	#include <OpenGL/glu.h>	5	#include <OpenGL/glu.h>
5	#include <SDL/sdl.h>	6	#include <SDL/sdl.h>
6	#include <SDL_image/SDL_image.h>	7	#include <SDL_image/SDL_image.h>
		8	#else
		9	#include <GL/gl.h>
		10	#include <GL/glu.h>
		11	#include <SDL/SDL.h>
		12	#include <SDL/SDL_image.h>
		13	#endif
		14
7	#include <iostream>	15	#include <iostream>
8	#include <string>	16	#include <string>
9	#include <vector>	17	#include <vector>