Moved zone.h and zone.c to tools

This commit is contained in:
Michaël Lemaire 2013-09-27 22:06:00 +02:00
parent 8d701e910b
commit be19d1d759
4 changed files with 15 additions and 11 deletions

View file

@ -16,7 +16,6 @@ linux-clang {
DEFINES += HAVE_GLIB=1 DEFINES += HAVE_GLIB=1
SOURCES += main.c \ SOURCES += main.c \
zone.c \
tools.c \ tools.c \
system.c \ system.c \
scenery.c \ scenery.c \
@ -54,6 +53,7 @@ SOURCES += main.c \
textures/tex_preview.c \ textures/tex_preview.c \
textures/tex_presets.c \ textures/tex_presets.c \
textures/tex_definition.c \ textures/tex_definition.c \
tools/zone.c \
tools/texture.c \ tools/texture.c \
tools/parallel.c \ tools/parallel.c \
tools/pack.c \ tools/pack.c \
@ -73,7 +73,6 @@ SOURCES += main.c \
water/wat_definition.c water/wat_definition.c
HEADERS += \ HEADERS += \
zone.h \
tools.h \ tools.h \
system.h \ system.h \
scenery.h \ scenery.h \
@ -103,6 +102,7 @@ HEADERS += \
textures/tex_preview.h \ textures/tex_preview.h \
textures/public.h \ textures/public.h \
textures/private.h \ textures/private.h \
tools/zone.h \
tools/texture.h \ tools/texture.h \
tools/parallel.h \ tools/parallel.h \
tools/pack.h \ tools/pack.h \

View file

@ -1,10 +1,10 @@
#ifndef _PAYSAGES_TEXTURES_PUBLIC_H_ #ifndef _PAYSAGES_TEXTURES_PUBLIC_H_
#define _PAYSAGES_TEXTURES_PUBLIC_H_ #define _PAYSAGES_TEXTURES_PUBLIC_H_
#include "../layers.h" #include "rendering/layers.h"
#include "../zone.h" #include "rendering/tools/zone.h"
#include "../tools/lighting.h" #include "rendering/tools/lighting.h"
#include "../terrain/public.h" #include "rendering/terrain/public.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

View file

@ -1,9 +1,13 @@
#ifndef _PAYSAGES_ZONE_H_ #ifndef _RENDERING_TOOLS_ZONE_H_
#define _PAYSAGES_ZONE_H_ #define _RENDERING_TOOLS_ZONE_H_
#include "tools/euclid.h" /**
#include "tools/curve.h" * Definition of a geographic area.
#include "tools/pack.h" */
#include "rendering/tools/euclid.h"
#include "rendering/tools/curve.h"
#include "rendering/tools/pack.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {