prep for runloop code

[chaz/yoink] / src / Main.cc

diff --git a/src/Main.cc b/src/Main.cc
index 13681ee0625fa74d578fd1dcdb24f49db5e5129e..c76a6148bf84abb6a8b48c03f92f1e6de4055185 100644 (file)
--- a/src/Main.cc
+++ b/src/Main.cc
@@ -20,7 +20,7 @@
 #if !defined(__WIN32)
 #include <termios.h>
 #else
-int isatty(int dummy) { return 0; }
+inline int isatty(int dummy) { return 0; }
 #endif
 
 #include <stlplus/portability/file_system.hpp>
@@ -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,13 +159,13 @@ 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);
 
-       //glEnable(GL_POINT_SMOOTH);
-       //glEnable(GL_LINE_SMOOTH);
-       //glEnable(GL_POLYGON_SMOOTH);
+       glEnable(GL_POINT_SMOOTH);
+       glEnable(GL_LINE_SMOOTH);
+       glEnable(GL_POLYGON_SMOOTH);
        glShadeModel(GL_SMOOTH);
 
        //glEnable(GL_BLEND);
@@ -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);
@@ -331,7 +331,7 @@ void goodbye()
 
 int main(int argc, char* argv[])
 {
-       moof::backend backend;
+       //moof::backend backend;
 
        if (argc > 1)
        {