ashima
/
webgl-noise
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaned up Win32 build a little

master
stegu 2011-03-25 12:12:04 +01:00
parent 8849f11a0b
commit 6a9dcd7322
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
benchmark/Makefile
View File

@ -1,13 +1,14 @@
WINMAKE = mingw32-make
.PHONY: default clean Linux MacOSX Win32 clean-Win32
default:
@echo "Usage:"
@echo "make [ Linux | MacOSX | Win32 ]"
@echo "make [ Linux | MacOSX | Win32 | clean | clean-Win32]"
clean:
cd Linux ; make clean
cd MacOSX ; make clean
cd Win32 ; make clean
Linux:
cd common ; make
@ -18,8 +19,8 @@ MacOSX:
cd $@ ; make ; make run
Win32:
cd common && mingw32-make
cd $@ && mingw32-make && mingw32-make run
cd common && $(WINMAKE)
cd $@ && $(WINMAKE) && $(WINMAKE)
clean-Win32:
cd Win32 && mingw32-make clean
cd Win32 && $(WINMAKE) clean

0
benchmark/Win32/glext.h → benchmark/Win32/GL/glext.h Executable file → Normal file
View File

4
benchmark/common/noisebench.c
View File

@ -16,7 +16,7 @@
*/
// Identify the exact version of noise being benchmarked
#define NOISEVERSION "2011-03-21"
#define NOISEVERSION "2011-03-25"
#include <stdio.h>
#include <stdlib.h>
@ -25,7 +25,7 @@
#ifdef __WIN32__
// The system level include file for GL extensions might not be up to date.
#include "glext.h"
#include "GL/glext.h"
#else
#include <GL/glext.h>
#endif