Skip to content
Snippets Groups Projects
Commit b585519d authored by Federico's avatar Federico
Browse files

Fix building code generators

parent fefd33d5
Branches
No related tags found
No related merge requests found
...@@ -40,8 +40,8 @@ target_link_libraries(resourcefs ${Boost_LIBRARIES}) ...@@ -40,8 +40,8 @@ target_link_libraries(resourcefs ${Boost_LIBRARIES})
#include_directories(${FREETYPE_INCLUDE_DIRS}) #include_directories(${FREETYPE_INCLUDE_DIRS})
#target_link_libraries(fontrendering ${FREETYPE_LIBRARIES}) #target_link_libraries(fontrendering ${FREETYPE_LIBRARIES})
## Uncomment this if you want to build and use freetype 2.4.3 ## Uncomment this if you want to build and use freetype 2.4.3
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/build/freetype-2.4.3/include) include_directories(${CMAKE_CURRENT_BINARY_DIR}/freetype-2.4.3/include)
find_library(FREETYPE NAMES freetype HINTS ${CMAKE_CURRENT_SOURCE_DIR}/build/freetype-2.4.3/objs/.libs) find_library(FREETYPE NAMES freetype HINTS ${CMAKE_CURRENT_BINARY_DIR}/freetype-2.4.3/objs/.libs)
target_link_libraries(fontrendering ${FREETYPE}) target_link_libraries(fontrendering ${FREETYPE})
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
using namespace std; using namespace std;
using namespace boost::program_options; using namespace boost::program_options;
using namespace boost::filesystem; namespace fs = boost::filesystem;
/** /**
* \param an unsigned int * \param an unsigned int
...@@ -83,10 +83,10 @@ int main(int argc, char *argv[]) ...@@ -83,10 +83,10 @@ int main(int argc, char *argv[])
} }
//Traverse the input directory storing path of files //Traverse the input directory storing path of files
path inDir(vm["in"].as<string>()); fs::path inDir(vm["in"].as<string>());
directory_iterator end; fs::directory_iterator end;
vector<path> files; vector<fs::path> files;
for(directory_iterator it(inDir);it!=end;++it) for(fs::directory_iterator it(inDir);it!=end;++it)
{ {
if(is_directory(it->status())) if(is_directory(it->status()))
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment