From 7fe31131269875ea560fd230db5d6bef5751425c Mon Sep 17 00:00:00 2001 From: Nick Gasson Date: Sun, 28 Mar 2010 12:12:34 +0100 Subject: [PATCH] Bump version --- CMakeLists.txt | 5 ++--- src/Resource.cpp | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 179acdf..c2ef9e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required (VERSION 2.6) project (TrainGame) set (${PROJECT_NAME}_MAJOR_VERSION 0) -set (${PROJECT_NAME}_MINOR_VERSION 1) +set (${PROJECT_NAME}_MINOR_VERSION 2) set (${PROJECT_NAME}_PATCH_LEVEL 0) set (EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) @@ -40,7 +40,6 @@ include_directories (include ${OPENGL_INCLUDE_DIR}) include_directories (include ${GLEW_INCLUDE_DIR}) include_directories (include ${XERCES_INCLUDE_DIRS}) include_directories (include ${FREETYPE_INCLUDE_DIRS}) -include_directories (include ${FLTK_INCLUDE_DIRS}) include_directories (include ${CMAKE_CURRENT_BINARY_DIR}) if (NOT WIN32) # Unix @@ -54,7 +53,7 @@ add_executable (${PROJECT_NAME} WIN32 ${folder_source}) target_link_libraries (${PROJECT_NAME} ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${OPENGL_LIBRARY} ${XERCES_LIBRARIES} ${Boost_LIBRARIES} - ${FREETYPE_LIBRARIES} ${GLEW_LIBRARY} ${FLTK_LIBRARIES}) + ${FREETYPE_LIBRARIES} ${GLEW_LIBRARY}) # Profiling if (PROFILE) diff --git a/src/Resource.cpp b/src/Resource.cpp index e36c567..ae2a803 100644 --- a/src/Resource.cpp +++ b/src/Resource.cpp @@ -20,6 +20,7 @@ #include #include +#include #include @@ -123,6 +124,19 @@ namespace { void initResources() { lookInDir(current_path()); + + ostringstream ss; + ss << "Found "; + + for (const char **it = classes; *it; ++it) { + const ResourceList& lst = resClassList(*it); + + if (it != classes) + ss << ", "; + ss << lst.size() << " " << *it; + } + + log() << ss.str(); } // Find all the resources of the given type -- 2.39.2