From bfd25bcf42d2e465075ecda59d8bf9c2e749e679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= Date: Fri, 23 Dec 2011 22:00:19 +0000 Subject: [PATCH] paysages: Refactoring sources (WIP) git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@199 b1fd45b6-86a6-48da-8261-f70d1f35bdcc --- CMakeLists.txt | 26 ------------------------ Makefile | 7 +++++++ {src/gui => gui_gtk}/common.h | 0 {src/gui => gui_gtk}/dlg_noise.c | 0 {src/gui => gui_gtk}/global.c | 0 {src/gui => gui_gtk}/preview.c | 0 {src/gui => gui_gtk}/tab_clouds.c | 0 {src/gui => gui_gtk}/tab_render.c | 0 {src/gui => gui_gtk}/tab_sky.c | 0 {src/gui => gui_gtk}/tab_terrain.c | 0 {src/gui => gui_gtk}/tab_water.c | 0 lib_paysages/Makefile | 21 +++++++++++++++++++ {src => lib_paysages}/array.c | 0 {src => lib_paysages}/auto.c | 0 {src => lib_paysages}/camera.c | 0 {src => lib_paysages}/clouds.c | 0 {src => lib_paysages}/clouds.h | 0 {src => lib_paysages}/color.c | 0 {src => lib_paysages}/euclid.c | 0 {src => lib_paysages}/fog.c | 0 {src => lib_paysages}/lighting.c | 0 {src => lib_paysages}/main.c | 0 {src => lib_paysages}/modifiers.c | 0 {src => lib_paysages}/noise.c | 0 {src => lib_paysages}/render.c | 0 {src => lib_paysages}/shared/constants.h | 0 {src => lib_paysages}/shared/functions.h | 0 {src => lib_paysages}/shared/globals.h | 0 {src => lib_paysages}/shared/system.h | 0 {src => lib_paysages}/shared/types.h | 0 {src => lib_paysages}/sky.c | 0 {src => lib_paysages}/sky.h | 0 {src => lib_paysages}/terrain.c | 0 {src => lib_paysages}/textures.c | 0 {src => lib_paysages}/tools.c | 0 {src => lib_paysages}/water.c | 0 {src => lib_paysages}/water.h | 0 {src => lib_paysages}/zone.c | 0 38 files changed, 28 insertions(+), 26 deletions(-) delete mode 100644 CMakeLists.txt create mode 100644 Makefile rename {src/gui => gui_gtk}/common.h (100%) rename {src/gui => gui_gtk}/dlg_noise.c (100%) rename {src/gui => gui_gtk}/global.c (100%) rename {src/gui => gui_gtk}/preview.c (100%) rename {src/gui => gui_gtk}/tab_clouds.c (100%) rename {src/gui => gui_gtk}/tab_render.c (100%) rename {src/gui => gui_gtk}/tab_sky.c (100%) rename {src/gui => gui_gtk}/tab_terrain.c (100%) rename {src/gui => gui_gtk}/tab_water.c (100%) create mode 100644 lib_paysages/Makefile rename {src => lib_paysages}/array.c (100%) rename {src => lib_paysages}/auto.c (100%) rename {src => lib_paysages}/camera.c (100%) rename {src => lib_paysages}/clouds.c (100%) rename {src => lib_paysages}/clouds.h (100%) rename {src => lib_paysages}/color.c (100%) rename {src => lib_paysages}/euclid.c (100%) rename {src => lib_paysages}/fog.c (100%) rename {src => lib_paysages}/lighting.c (100%) rename {src => lib_paysages}/main.c (100%) rename {src => lib_paysages}/modifiers.c (100%) rename {src => lib_paysages}/noise.c (100%) rename {src => lib_paysages}/render.c (100%) rename {src => lib_paysages}/shared/constants.h (100%) rename {src => lib_paysages}/shared/functions.h (100%) rename {src => lib_paysages}/shared/globals.h (100%) rename {src => lib_paysages}/shared/system.h (100%) rename {src => lib_paysages}/shared/types.h (100%) rename {src => lib_paysages}/sky.c (100%) rename {src => lib_paysages}/sky.h (100%) rename {src => lib_paysages}/terrain.c (100%) rename {src => lib_paysages}/textures.c (100%) rename {src => lib_paysages}/tools.c (100%) rename {src => lib_paysages}/water.c (100%) rename {src => lib_paysages}/water.h (100%) rename {src => lib_paysages}/zone.c (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index 3921080..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,26 +0,0 @@ -cmake_minimum_required(VERSION 2.8) -project(paysages) - -include(FindPkgConfig) - -find_package(DevIL) - -pkg_check_modules(GTK3 gtk+-3.0) - -include_directories(${IL_INCLUDE_DIR}) -include_directories(${GTK3_INCLUDE_DIRS}) - -aux_source_directory(src SOURCE_FILES) -aux_source_directory(src/gui SOURCE_FILES) - -#set(CMAKE_C_FLAGS "${GTK3_CFLAGS_OTHER}") -set(CMAKE_C_FLAGS_PROFILE "-pg -O0") -set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall") - -if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE debug) -endif(NOT CMAKE_BUILD_TYPE) - -add_executable(paysages ${SOURCE_FILES}) -target_link_libraries(paysages ${IL_LIBRARIES} ${ILU_LIBRARIES} ${GTK3_LIBRARIES}) - diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..fd91d01 --- /dev/null +++ b/Makefile @@ -0,0 +1,7 @@ +all: + cd lib_paysages && make + +clean: + cd lib_paysages && make clean + +.PHONY:all clean diff --git a/src/gui/common.h b/gui_gtk/common.h similarity index 100% rename from src/gui/common.h rename to gui_gtk/common.h diff --git a/src/gui/dlg_noise.c b/gui_gtk/dlg_noise.c similarity index 100% rename from src/gui/dlg_noise.c rename to gui_gtk/dlg_noise.c diff --git a/src/gui/global.c b/gui_gtk/global.c similarity index 100% rename from src/gui/global.c rename to gui_gtk/global.c diff --git a/src/gui/preview.c b/gui_gtk/preview.c similarity index 100% rename from src/gui/preview.c rename to gui_gtk/preview.c diff --git a/src/gui/tab_clouds.c b/gui_gtk/tab_clouds.c similarity index 100% rename from src/gui/tab_clouds.c rename to gui_gtk/tab_clouds.c diff --git a/src/gui/tab_render.c b/gui_gtk/tab_render.c similarity index 100% rename from src/gui/tab_render.c rename to gui_gtk/tab_render.c diff --git a/src/gui/tab_sky.c b/gui_gtk/tab_sky.c similarity index 100% rename from src/gui/tab_sky.c rename to gui_gtk/tab_sky.c diff --git a/src/gui/tab_terrain.c b/gui_gtk/tab_terrain.c similarity index 100% rename from src/gui/tab_terrain.c rename to gui_gtk/tab_terrain.c diff --git a/src/gui/tab_water.c b/gui_gtk/tab_water.c similarity index 100% rename from src/gui/tab_water.c rename to gui_gtk/tab_water.c diff --git a/lib_paysages/Makefile b/lib_paysages/Makefile new file mode 100644 index 0000000..c55a780 --- /dev/null +++ b/lib_paysages/Makefile @@ -0,0 +1,21 @@ +SOURCES=$(wildcard *.c) +OBJECTS=${SOURCES:.c=.o} +HEADERS=$(wildcard shared/*.h *.h) +RESULT=libpaysages.so +CC_FLAGS=-g -pg -Wall $(shell pkg-config --cflags glib-2.0) +CC_LDFLAGS=$(shell pkg-config --libs glib-2.0) + +all:${RESULT} + +clean: + rm -f ${OBJECTS} + rm -f ${RESULT} + +%.o:%.c ${HEADERS} + ${CC} -c ${CC_FLAGS} $< -o $@ + +${RESULT}:${OBJECTS} + ${CC} -o $@ -shared -Wl ${CC_LDFLAGS} $* + +.PHONY:all clean + diff --git a/src/array.c b/lib_paysages/array.c similarity index 100% rename from src/array.c rename to lib_paysages/array.c diff --git a/src/auto.c b/lib_paysages/auto.c similarity index 100% rename from src/auto.c rename to lib_paysages/auto.c diff --git a/src/camera.c b/lib_paysages/camera.c similarity index 100% rename from src/camera.c rename to lib_paysages/camera.c diff --git a/src/clouds.c b/lib_paysages/clouds.c similarity index 100% rename from src/clouds.c rename to lib_paysages/clouds.c diff --git a/src/clouds.h b/lib_paysages/clouds.h similarity index 100% rename from src/clouds.h rename to lib_paysages/clouds.h diff --git a/src/color.c b/lib_paysages/color.c similarity index 100% rename from src/color.c rename to lib_paysages/color.c diff --git a/src/euclid.c b/lib_paysages/euclid.c similarity index 100% rename from src/euclid.c rename to lib_paysages/euclid.c diff --git a/src/fog.c b/lib_paysages/fog.c similarity index 100% rename from src/fog.c rename to lib_paysages/fog.c diff --git a/src/lighting.c b/lib_paysages/lighting.c similarity index 100% rename from src/lighting.c rename to lib_paysages/lighting.c diff --git a/src/main.c b/lib_paysages/main.c similarity index 100% rename from src/main.c rename to lib_paysages/main.c diff --git a/src/modifiers.c b/lib_paysages/modifiers.c similarity index 100% rename from src/modifiers.c rename to lib_paysages/modifiers.c diff --git a/src/noise.c b/lib_paysages/noise.c similarity index 100% rename from src/noise.c rename to lib_paysages/noise.c diff --git a/src/render.c b/lib_paysages/render.c similarity index 100% rename from src/render.c rename to lib_paysages/render.c diff --git a/src/shared/constants.h b/lib_paysages/shared/constants.h similarity index 100% rename from src/shared/constants.h rename to lib_paysages/shared/constants.h diff --git a/src/shared/functions.h b/lib_paysages/shared/functions.h similarity index 100% rename from src/shared/functions.h rename to lib_paysages/shared/functions.h diff --git a/src/shared/globals.h b/lib_paysages/shared/globals.h similarity index 100% rename from src/shared/globals.h rename to lib_paysages/shared/globals.h diff --git a/src/shared/system.h b/lib_paysages/shared/system.h similarity index 100% rename from src/shared/system.h rename to lib_paysages/shared/system.h diff --git a/src/shared/types.h b/lib_paysages/shared/types.h similarity index 100% rename from src/shared/types.h rename to lib_paysages/shared/types.h diff --git a/src/sky.c b/lib_paysages/sky.c similarity index 100% rename from src/sky.c rename to lib_paysages/sky.c diff --git a/src/sky.h b/lib_paysages/sky.h similarity index 100% rename from src/sky.h rename to lib_paysages/sky.h diff --git a/src/terrain.c b/lib_paysages/terrain.c similarity index 100% rename from src/terrain.c rename to lib_paysages/terrain.c diff --git a/src/textures.c b/lib_paysages/textures.c similarity index 100% rename from src/textures.c rename to lib_paysages/textures.c diff --git a/src/tools.c b/lib_paysages/tools.c similarity index 100% rename from src/tools.c rename to lib_paysages/tools.c diff --git a/src/water.c b/lib_paysages/water.c similarity index 100% rename from src/water.c rename to lib_paysages/water.c diff --git a/src/water.h b/lib_paysages/water.h similarity index 100% rename from src/water.h rename to lib_paysages/water.h diff --git a/src/zone.c b/lib_paysages/zone.c similarity index 100% rename from src/zone.c rename to lib_paysages/zone.c