new file mode 100644

@@ -0,0 +1,49 @@

+ifeq ($(OS),Windows_NT)

+        OS = Windows

+        MICROGLUT = MicroGlut.c

+else ifeq ($(shell uname),Linux)

+        OS = Linux

+        MICROGLUT = MicroGlut.c

+else ifeq ($(shell uname),Darwin)

+        OS = Mac

+        MICROGLUT = MicroGlut.m

+endif

+

+PROG = tsbk07

+COMMON = \

+	common/GL_utilities.c \

+	common/LoadTGA.c \

+	common/$(OS)/$(MICROGLUT)

+CPPFLAGS += \

+	-Icommon \

+	-Icommon/$(OS) \

+	-DGL_GLEXT_PROTOTYPES

+CXXFLAGS += \

+	-g \

+	-Wall \

+	-Wextra \

+	-Wpedantic \

+	-Wshadow

+LDLIBS_Windows += \

+	-lopengl32

+LDLIBS_Linux += \

+	-lX11 \

+	-lGL

+LDLIBS_Mac += \

+	-framework Cocoa \

+	-framework OpenGL

+LDLIBS += \

+	$(LDLIBS_$(OS))

+

+# The below is equivalent to the GNU Make implicit rule for

+# $(PROG): $(COMMON)

+$(PROG): $(PROG).cpp $(COMMON)

+	g++ $(CXXFLAGS) $(CPPFLAGS) $(PROG).cpp $(COMMON) $(LDLIBS) -o $(PROG)

+

+.PHONY: clean

+clean:

+	rm $(PROG)

+

+.PHONY: run

+run: $(PROG)

+	./$(PROG)

@@ -83,6 +83,8 @@ static char gRunning = 1;

 void glutInit(int *argc, char *argv[])

 {

+	(void)argc;

+	(void)argv;

 	gettimeofday(&timeStart, NULL);

 	memset(gKeymap, 0, sizeof(gKeymap));

 }

@@ -110,16 +112,13 @@ static void checktimers();

  */

 static void

-make_window( Display *dpy, const char *name,

-             int x, int y, int width, int height,

-             Window *winRet, GLXContext *ctxRet)

+make_window( const char *name,

+             int x, int y, int width, int height)

 {

    int scrnum;

    XSetWindowAttributes attr;

    unsigned long mask;

    Window root;

-   Window win;

-   GLXContext ctx;

    XVisualInfo *visinfo;

    scrnum = DefaultScreen( dpy );

@@ -305,9 +304,6 @@ make_window( Display *dpy, const char *name,

    }

    XFree(visinfo);

-

-   *winRet = win;

-   *ctxRet = ctx;

 }

 void glutCreateWindow(const char *windowTitle)

@@ -319,7 +315,7 @@ void glutCreateWindow(const char *windowTitle)

 	     windowTitle ? windowTitle : getenv("DISPLAY"));

    }

-   make_window(dpy, windowTitle, winPosX, winPosY, winWidth, winHeight, &win, &ctx);

+   make_window(windowTitle, winPosX, winPosY, winWidth, winHeight);

    XMapWindow(dpy, win);

    glXMakeCurrent(dpy, win, ctx);

@@ -455,6 +451,7 @@ void doKeyboardEvent(XEvent event, void (*keyProc)(unsigned char key, int x, int

 void internaltimer(int x)

 {

+	(void)x;

 	glutPostRedisplay();

 }

@@ -479,7 +476,7 @@ void glutMainLoop()

          switch (event.type)

          {

          	case ClientMessage:

-         		if (event.xclient.data.l[0] == wmDeleteMessage) // quit!

+         		if ((Atom)event.xclient.data.l[0] == wmDeleteMessage) // quit!

          			gRunning = 0;

 	         	break;

          	case Expose: 

@@ -49,7 +49,7 @@ bool LoadTGATextureData(const char *filename, TextureData *texture)	// Loads A T

 	GLubyte *rowP;

 	int err;

 	GLubyte rle;

-	int b;

+	GLuint b;

 	long row, rowLimit;

 	GLubyte pixelData[4];	

@@ -199,7 +199,7 @@ bool LoadTGATextureData(const char *filename, TextureData *texture)	// Loads A T

 	}

 	if (bytesPerPixel >= 3) // if not monochrome	

-	for (i = 0; i < (int)(imageSize); i += bytesPerPixel)	// Loop Through The Image Data

+	for (i = 0; i < imageSize; i += bytesPerPixel)	// Loop Through The Image Data

 	{		// Swaps The 1st And 3rd Bytes ('R'ed and 'B'lue)

 		temp = texture->imageData[i];		// Temporarily Store The Value At Image Data 'i'

 		texture->imageData[i] = texture->imageData[i + 2];	// Set The 1st Byte To The Value Of The 3rd Byte

deleted file mode 100644

@@ -1,11 +0,0 @@

-# set this variable to the director in which you saved the common files

-commondir = common/

-

-all : tsbk07

-

-tsbk07 : tsbk07.cpp $(commondir)GL_utilities.c $(commondir)LoadTGA.c $(commondir)Linux/MicroGlut.c

-	gcc -Wall -o tsbk07 -I$(commondir) -Icommon/Linux -DGL_GLEXT_PROTOTYPES tsbk07.cpp $(commondir)GL_utilities.c $(commondir)LoadTGA.c $(commondir)Linux/MicroGlut.c -lXt -lX11 -lGL -lm -lstdc++

-

-clean :

-	rm tsbk07

-