graphics/paysages3d
1
0
Fork 0
Code Releases Activity

Fix some compile issues on windows

Browse source
This commit is contained in:
Michaël Lemaire 2013-06-21 15:01:39 +02:00
parent 9ca8232966
commit 88a2e90f8b
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/editing/baseexplorerchunk.cpp
View file

@ -1,5 +1,9 @@
#include "baseexplorerchunk.h" #include "baseexplorerchunk.h"
#ifndef GL_CLAMP_TO_EDGE
#define GL_CLAMP_TO_EDGE 0x812F
#endif
BaseExplorerChunk::BaseExplorerChunk(Renderer* renderer) BaseExplorerChunk::BaseExplorerChunk(Renderer* renderer)
{ {
_renderer = renderer; _renderer = renderer;

7
src/editing/paysages-qt.pro
View file

@ -15,11 +15,10 @@ CONFIG += $$BUILDMODE
INCLUDEPATH += $$PROJECT_PATH/src/ INCLUDEPATH += $$PROJECT_PATH/src/
release:DEFINES += NDEBUG release:DEFINES += NDEBUG
release:QMAKE_CXXFLAGS += -Wno-unused-variable -Wno-unused-parameter -Wno-unused-but-set-variable release:QMAKE_CXXFLAGS += -Wno-unused-variable -Wno-unused-parameter
LIBS += -lGLU unix:LIBS += -L$$DESTDIR -lpaysages_rendering -lpaysages_exploring -lGLU
unix:LIBS += -L$$DESTDIR -lpaysages_rendering -lpaysages_exploring win32:LIBS += $$PROJECT_PATH/libpaysages.a -lDevIL -lILU -lILUT -lglib-2.0 -lgthread-2.0
win32:LIBS += ../libpaysages.a ../libpaysages_exploring.a -lDevIL -lILU -lILUT -lglib-2.0 -lgthread-2.0
TRANSLATIONS = $$PROJECT_PATH/data/i18n/paysages_fr.ts TRANSLATIONS = $$PROJECT_PATH/data/i18n/paysages_fr.ts

11
src/rendering/noiseperlin.c
View file

@ -9,10 +9,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
#include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <math.h>
#define B 0x100 #define B 0x100
#define BM 0xff #define BM 0xff
@ -161,20 +158,20 @@ void noisePerlinInit(void)
for (i = 0 ; i < B ; i++) { for (i = 0 ; i < B ; i++) {
p[i] = i; p[i] = i;
g1[i] = (double)((random() % (B + B)) - B) / B; g1[i] = (double)((rand() % (B + B)) - B) / B;
for (j = 0 ; j < 2 ; j++) for (j = 0 ; j < 2 ; j++)
g2[i][j] = (double)((random() % (B + B)) - B) / B; g2[i][j] = (double)((rand() % (B + B)) - B) / B;
_normalize2(g2[i]); _normalize2(g2[i]);
for (j = 0 ; j < 3 ; j++) for (j = 0 ; j < 3 ; j++)
g3[i][j] = (double)((random() % (B + B)) - B) / B; g3[i][j] = (double)((rand() % (B + B)) - B) / B;
_normalize3(g3[i]); _normalize3(g3[i]);
} }
while (--i) { while (--i) {
k = p[i]; k = p[i];
p[i] = p[j = random() % B]; p[i] = p[j = rand() % B];
p[j] = k; p[j] = k;
} }