From 9779856e0750ff1eea551898e7adec4ea6239523 Mon Sep 17 00:00:00 2001 From: haraldhv Date: Fri, 23 Feb 2007 17:42:21 +0000 Subject: [PATCH] Now using cmake --- CMakeLists.txt | 21 +++------------------ lib/CMakeLists.txt | 47 ++++++++++++---------------------------------- 2 files changed, 15 insertions(+), 53 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 79377ce..c0678de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,21 +1,6 @@ project(EVERYTHING) -set(dgl_DIR dgl) -get_filename_component(dgl_ABSOLUTE ${dgl_DIR} ABSOLUTE) -add_subdirectory(${dgl_ABSOLUTE}) +set(lib_DIR lib) +get_filename_component(lib_ABSOLUTE ${lib_DIR} ABSOLUTE) +add_subdirectory(${lib_ABSOLUTE}) -set(effector_DIR effector) -get_filename_component(effector_ABSOLUTE ${effector_DIR} ABSOLUTE) -add_subdirectory(${effector_ABSOLUTE}) - -set(prods_DIR prods) -get_filename_component(prods_ABSOLUTE ${prods_DIR} ABSOLUTE) -add_subdirectory(${prods_ABSOLUTE}) - -#set(editor_DIR editor) -#get_filename_component(editor_ABSOLUTE ${editor_DIR} ABSOLUTE) -#add_subdirectory(${editor_ABSOLUTE}) - -set(shadertest_DIR shadertest) -get_filename_component(shadertest_ABSOLUTE ${shadertest_DIR} ABSOLUTE) -add_subdirectory(${shadertest_ABSOLUTE}) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 7990c56..1fa2faa 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -1,52 +1,29 @@ -project(dgl) +project(aigo) -set(DGL_SRCS - dgl_default_shaders.c - dgl_error.c - dgl_fbo.c - dgl_font.c - dgl_image.c - dgl_input.c - dgl_math.c - dgl_model_ase.c - dgl_model_binary.c - dgl_model.c - dgl_perspective.c - dgl_shader.c - dgl_skeleton.c - dgl_sound.c - dgl_timer.c - dgl_window.c +set(AIGO_SRCS + camera.cpp + quickcam.cpp + settings.cpp + state.cpp ) #find SDL and its related libraries find_package(SDL REQUIRED) find_package(SDL_image REQUIRED) -find_package(SDL_mixer REQUIRED) -include_directories( ${SDL_INCLUDE_DIR} ${SDLIMAGE_INCLUDE_DIR} ${SDLMIXER_INCLUDE_DIR}) +include_directories( ${SDL_INCLUDE_DIR} ${SDLIMAGE_INCLUDE_DIR} ) #find OpenGL and GLU find_package(OpenGL REQUIRED) include_directories( ${OPENGL_INCLUDE_DIR} ) #find GLEW -set(CMAKE_MODULE_PATH ..) -find_package(GLEW REQUIRED) +#set(CMAKE_MODULE_PATH ..) +#find_package(GLEW REQUIRED) - -#compile the dgl library -add_library(dgl ${DGL_SRCS}) +#compile the aigo library +add_library(aigo ${AIGO_SRCS}) #SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99") # c99 flag not used now, not supported by visual studio -target_link_libraries(dgl ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLMIXER_LIBRARY} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} ) +target_link_libraries(aigo ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${OPENGL_LIBRARIES} ) -#extra mac weirdness thingy line -if (APPLE) -#SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Dmain=SDL_main ") -target_link_libraries(dgl -lSDLmain) -endif (APPLE) - -#compile the test library -add_executable(test main.c) -target_link_libraries(test dgl)