prep for runloop code

[chaz/yoink] / src / Main.cc

diff --git a/src/Main.cc b/src/Main.cc
index ff2ce61d081fc47ffa5a8c42c35322ea99db614d..c76a6148bf84abb6a8b48c03f92f1e6de4055185 100644 (file)
--- a/src/Main.cc
+++ b/src/Main.cc
@@ -48,7 +48,7 @@ Main::Main(moof::settings& settings, moof::video& video) :
                                                                                        boost::bind(&Main::setup_opengl));
        setup_opengl();
 
-#if USE_HOTLOADING
+#if ENABLE_HOTLOADING
        hotload_timer_.init(boost::bind(&moof::resource::reload_as_needed),
                                                SCALAR(0.25),
                                                moof::timer::repeat);
@@ -159,7 +159,7 @@ std::string Main::config_paths()
 
 void Main::setup_opengl()
 {
-       glEnable(GL_TEXTURE_2D);
+       //glEnable(GL_TEXTURE_2D);
        glEnable(GL_DEPTH_TEST);
        //glEnable(GL_CULL_FACE);
 
@@ -259,7 +259,7 @@ void Main::print_info(int argc, char* argv[])
                          << "       Assets: " << assets << std::endl
                          << "Build options: ";
 
-#if USE_CLOCK_GETTIME
+#if ENABLE_CLOCK_GETTIME
        print_option("clock_gettime", true);
 #else
        print_option("clock_gettime", false);
@@ -269,12 +269,12 @@ void Main::print_info(int argc, char* argv[])
 #else
        print_option("debug", false);
 #endif
-#if USE_GTK
+#if WITH_GTK
        print_option("gtk", true);
 #else
        print_option("gtk", false);
 #endif
-#if USE_HOTLOADING
+#if ENABLE_HOTLOADING
        print_option("hotload", true);
 #else
        print_option("hotload", false);
@@ -284,12 +284,12 @@ void Main::print_info(int argc, char* argv[])
 #else
        print_option("profile", false);
 #endif
-#if USE_QT4
+#if WITH_QT4
        print_option("qt4", true);
 #else
        print_option("qt4", false);
 #endif
-#if USE_THREADS
+#if ENABLE_THREADS
        print_option("threads", true);
 #else
        print_option("threads", false);