Merge branch 'master' of github.com:FacialTurd/PowderToypp

6 files changed, 34 insertions, 25 deletions

diff --git a/Makefile b/Makefile
index cf663f2..742ccd2 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,9 @@ all: build/powder
 powder-release.exe: build/powder-release.exe
 powder.exe: build/powder.exe
 powder-release: build/powder-release
+powder-opengl-release: build/powder-opengl-release
 powder: build/powder
+powder-opengl: build/powder-opengl
 powder-x: build/powder-x
 powder-x.jnilib: build/powder-x.jnilib
 
@@ -24,10 +26,14 @@ build/powder-release.exe: CFLAGS += -DWIN32 -O3 -ftree-vectorize -msse2 -funsafe
 build/powder-release.exe: LFLAGS := -lmingw32 -lregex -lws2_32 -lSDLmain -lpthread -lSDL -lm -lbz2 -llua -lfftw3f-3 -mwindows
 build/powder.exe: CFLAGS += -DWIN32
 build/powder.exe: LFLAGS := -lmingw32 -lregex -lws2_32 -lSDLmain -lpthread -lSDL -lm -lbz2 -llua -lfftw3f-3 #-mwindows
-build/powder-release: CFLAGS +=  -DLIN32 -O3 -ftree-vectorize -msse2 -funsafe-math-optimizations -ffast-math -fomit-frame-pointer -funsafe-loop-optimizations -Wunsafe-loop-optimizations
+build/powder-release: CFLAGS +=  -DLIN32 -O3 -ftree-vectorize -msse3 -funsafe-math-optimizations -ffast-math -fomit-frame-pointer -funsafe-loop-optimizations -Wunsafe-loop-optimizations
 build/powder-release: LFLAGS := -lSDL -lm -lbz2 -llua -lfftw3f
+build/powder-opengl-release: CFLAGS +=  -DLIN32 -O3 -ftree-vectorize -msse3 -funsafe-math-optimizations -ffast-math -fomit-frame-pointer -funsafe-loop-optimizations -Wunsafe-loop-optimizations -DOGLR -DPIX32OGL -DPIXALPHA
+build/powder-opengl-release: LFLAGS := -lSDL -lm -lbz2 -llua -lfftw3f -lGL -lGLEW -DOGLR -DPIX32OGL -DPIXALPHA
 build/powder: CFLAGS +=  -DLIN32
-build/powder: LFLAGS := -lSDL -lm -lbz2 -llua -lfftw3f
+build/powder: LFLAGS := -lSDL -lm -lbz2 -llua -lfftw3f 
+build/powder-opengl: CFLAGS +=  -DLIN32 -DOGLR -DPIX32OGL -DPIXALPHA
+build/powder-opengl: LFLAGS := -lSDL -lm -lbz2 -llua -lfftw3f  -lGL -lGLEW
 #build/powder-x: CFLAGS += -DMACOSX -I/Library/Frameworks/SDL.framework/Headers -I/Library/Frameworks/Lua.framework/Headers -I/Library/Frameworks/OpenGL.framework/Headers -DOGLR -DPIX32OGL -DPIXALPHA
 #build/powder-x: LFLAGS := -lm -lbz2 -lfftw3f -framework SDL -framework Lua -framework Cocoa -framework OpenGL
 build/powder-x: CFLAGS += -DMACOSX -I/Library/Frameworks/SDL.framework/Headers -I/Library/Frameworks/Lua.framework/Headers -DPIX32BGRA
@@ -46,7 +52,9 @@ build/powder-res.o: resources/powder-res.rc resources/powder.ico resources/docum
 build/powder-release: $(SOURCES)
 	$(CPPC) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(SOURCES) $(LFLAGS) -o $@
 	strip $@
-
+build/powder-opengl-release: $(SOURCES)
+	$(CPPC) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(SOURCES) $(LFLAGS) -o $@
+	strip $@
 build/powder.exe: buildpaths-powder.exe generate $(patsubst build/obj/%.o,build/obj/powder.exe/%.o,$(OBJS)) build/powder-res.o
 	$(CPPC_WIN) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(patsubst build/obj/%.o,build/obj/powder.exe/%.o,$(OBJS)) build/powder-res.o $(LFLAGS) -o $@ -ggdb
 build/obj/powder.exe/%.o: src/%.cpp $(HEADERS)
@@ -57,12 +65,18 @@ buildpaths-powder.exe:
 
 build/powder: buildpaths-powder generate $(patsubst build/obj/%.o,build/obj/powder/%.o,$(OBJS))
 	$(CPPC) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(patsubst build/obj/%.o,build/obj/powder/%.o,$(OBJS)) $(LFLAGS) -o $@ -ggdb
+build/powder-opengl: buildpaths-powder-opengl generate $(patsubst build/obj/%.o,build/obj/powder-opengl/%.o,$(OBJS))
+	$(CPPC) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(patsubst build/obj/%.o,build/obj/powder-opengl/%.o,$(OBJS)) $(LFLAGS) -o $@ -ggdb
 build/obj/powder/%.o: src/%.cpp $(HEADERS)
 	$(CPPC) -c $(CFLAGS) $(OFLAGS) -o $@ $< -ggdb
+build/obj/powder-opengl/%.o: src/%.cpp $(HEADERS)
+	$(CPPC) -c $(CFLAGS) $(OFLAGS) -o $@ $< -ggdb
 buildpaths-powder:
 	$(shell mkdir -p build/obj/powder/)
 	$(shell mkdir -p $(sort $(dir $(patsubst build/obj/%.o,build/obj/powder/%.o,$(OBJS)))))
-
+buildpaths-powder-opengl:
+	$(shell mkdir -p build/obj/powder-opengl/)
+	$(shell mkdir -p $(sort $(dir $(patsubst build/obj/%.o,build/obj/powder-opengl/%.o,$(OBJS)))))
 build/powder-x: buildpaths-powder-x generate $(patsubst build/obj/%.o,build/obj/powder-x/%.o,$(OBJS))
 	$(CPPC) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(patsubst build/obj/%.o,build/obj/powder-x/%.o,$(OBJS)) SDLmain.m $(LFLAGS) -o $@ -ggdb
 build/obj/powder-x/%.o: src/%.cpp $(HEADERS)
diff --git a/src/OpenGLHeaders.h b/src/OpenGLHeaders.h
index 3f925ac..8a83472 100644
--- a/src/OpenGLHeaders.h
+++ b/src/OpenGLHeaders.h
@@ -18,7 +18,7 @@
 
 #else
 
-//#include <GL/glew.h>
+#include <GL/glew.h>
 #include <GL/gl.h>
 #include <GL/glu.h>
-#endif
\ No newline at end of file
+#endif
diff --git a/src/PowderToySDL.cpp b/src/PowderToySDL.cpp
index d268f57..53f9027 100644
--- a/src/PowderToySDL.cpp
+++ b/src/PowderToySDL.cpp
@@ -114,7 +114,7 @@ SDL_Surface * SDLOpen()
 	surface = SDL_SetVideoMode(XRES + BARSIZE, YRES + MENUSIZE, 32, SDL_OPENGL);
 #endif
 
-#if defined(WIN32) && defined(OGLR)
+#if defined(OGLR)
 	int status = glewInit();
 	if(status != GLEW_OK)
 	{
diff --git a/src/Renderer.cpp b/src/Renderer.cpp
index 53727ae..b16602a 100644
--- a/src/Renderer.cpp
+++ b/src/Renderer.cpp
@@ -4,7 +4,6 @@
  *  Created on: Jan 7, 2012
  *      Author: Simon
  */
-
 #include <cmath>
 #include <iostream>
 #include <vector>
diff --git a/src/Renderer.h b/src/Renderer.h
index 08befa6..8ad6a58 100644
--- a/src/Renderer.h
+++ b/src/Renderer.h
@@ -2,7 +2,7 @@
 #define RENDERER_H
 
 #include <vector>
-#if defined(OGLR)
+#ifdef OGLR
 #include "OpenGLHeaders.h"
 #endif
 
diff --git a/src/simulation/SaveRenderer.cpp b/src/simulation/SaveRenderer.cpp
index 5ea99e6..3d0e7c7 100644
--- a/src/simulation/SaveRenderer.cpp
+++ b/src/simulation/SaveRenderer.cpp
@@ -19,9 +19,7 @@ SaveRenderer::SaveRenderer(){
 
 Thumbnail * SaveRenderer::Render(GameSave * save)
 {
-	Thumbnail * tempThumb = NULL;
 	int width, height;
-
 #ifdef OGLR
 	width = save->blockWidth*CELL;
 	height = save->blockHeight*CELL;
@@ -42,23 +40,21 @@ Thumbnail * SaveRenderer::Render(GameSave * save)
 	
 	g->Clear();
 	sim->clear_sim();
-	if(sim->Load(save))
-		goto finish;
-	
-	ren->render_parts();
-	
-	dst = pData = (pixel *)malloc(PIXELSIZE * ((width*CELL)*(height*CELL)));
 	
-	for(int i = 0; i < height*CELL; i++)
+	if(!sim->Load(save))
 	{
-		memcpy(dst, src, (width*CELL)*PIXELSIZE);
-		dst+=(width*CELL);///PIXELSIZE;
-		src+=XRES+BARSIZE;
-	}
-	
-	tempThumb = new Thumbnail(0, 0, pData, ui::Point(width*CELL, height*CELL));
+		ren->render_parts();
 	
-finish:
+		pData = (pixel *)malloc(PIXELSIZE * ((width*CELL)*(height*CELL)));
+		dst = pData;
+		for(int i = 0; i < height*CELL; i++)
+		{
+			memcpy(dst, src, (width*CELL)*PIXELSIZE);
+			dst+=(width*CELL);///PIXELSIZE;
+			src+=XRES+BARSIZE;
+		}
+		tempThumb = new Thumbnail(0, 0, pData, ui::Point(width*CELL, height*CELL));
+	}
 	if(pData)
 		free(pData);
 	return tempThumb;