Merge remote-tracking branch 'upstream/master'

develop
Kelly Martin 2012-04-14 10:35:22 -05:00
commit 9f057c41af
1 changed files with 5 additions and 4 deletions

@ -20,10 +20,11 @@ if(BUILD_DEV_PLUGINS)
add_subdirectory (devel) add_subdirectory (devel)
endif() endif()
OPTION(BUILD_DF2MC "Build DF2MC (needs a checkout first)." OFF) #It's dead :<
if(BUILD_DF2MC) #OPTION(BUILD_DF2MC "Build DF2MC (needs a checkout first)." OFF)
add_subdirectory (df2mc) #if(BUILD_DF2MC)
endif() # add_subdirectory (df2mc)
#endif()
OPTION(BUILD_MAPEXPORT "Build map exporter." ON) OPTION(BUILD_MAPEXPORT "Build map exporter." ON)
if (BUILD_MAPEXPORT) if (BUILD_MAPEXPORT)