Fix some compile issues on windows
This commit is contained in:
parent
9ca8232966
commit
88a2e90f8b
3 changed files with 11 additions and 11 deletions
|
@ -1,5 +1,9 @@
|
|||
#include "baseexplorerchunk.h"
|
||||
|
||||
#ifndef GL_CLAMP_TO_EDGE
|
||||
#define GL_CLAMP_TO_EDGE 0x812F
|
||||
#endif
|
||||
|
||||
BaseExplorerChunk::BaseExplorerChunk(Renderer* renderer)
|
||||
{
|
||||
_renderer = renderer;
|
||||
|
|
|
@ -15,11 +15,10 @@ CONFIG += $$BUILDMODE
|
|||
INCLUDEPATH += $$PROJECT_PATH/src/
|
||||
|
||||
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
|
||||
win32:LIBS += ../libpaysages.a ../libpaysages_exploring.a -lDevIL -lILU -lILUT -lglib-2.0 -lgthread-2.0
|
||||
unix:LIBS += -L$$DESTDIR -lpaysages_rendering -lpaysages_exploring -lGLU
|
||||
win32:LIBS += $$PROJECT_PATH/libpaysages.a -lDevIL -lILU -lILUT -lglib-2.0 -lgthread-2.0
|
||||
|
||||
TRANSLATIONS = $$PROJECT_PATH/data/i18n/paysages_fr.ts
|
||||
|
||||
|
|
|
@ -9,10 +9,7 @@
|
|||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <math.h>
|
||||
|
||||
#define B 0x100
|
||||
#define BM 0xff
|
||||
|
@ -161,20 +158,20 @@ void noisePerlinInit(void)
|
|||
for (i = 0 ; i < B ; 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++)
|
||||
g2[i][j] = (double)((random() % (B + B)) - B) / B;
|
||||
g2[i][j] = (double)((rand() % (B + B)) - B) / B;
|
||||
_normalize2(g2[i]);
|
||||
|
||||
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]);
|
||||
}
|
||||
|
||||
while (--i) {
|
||||
k = p[i];
|
||||
p[i] = p[j = random() % B];
|
||||
p[i] = p[j = rand() % B];
|
||||
p[j] = k;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue