Index: trunk/src/sdl/sdl_audio.cc
===================================================================
--- trunk/src/sdl/sdl_audio.cc	(revision 357)
+++ trunk/src/sdl/sdl_audio.cc	(revision 365)
@@ -21,5 +21,5 @@
 	if ( SDL_Init( SDL_INIT_AUDIO ) == -1 ) 
 	{
-		NV_LOG( LOG_CRITICAL, "SDL_AUDIO failed to load -- " << SDL_GetError() );
+		NV_LOG_CRITICAL( "SDL_AUDIO failed to load -- ", SDL_GetError() );
 		return;
 	}
@@ -27,5 +27,5 @@
 	if( Mix_OpenAudio( 44100, MIX_DEFAULT_FORMAT, 2, 1024 ) == -1 )
 	{
-		NV_LOG( LOG_CRITICAL, "SDL_mixer failed to load -- " << Mix_GetError() );
+		NV_LOG_CRITICAL( "SDL_mixer failed to load -- ", Mix_GetError() );
 		return;
 	}
@@ -40,5 +40,5 @@
 		if ( channel == -1 )
 		{
-			NV_LOG( LOG_WARNING, "SDL_mixer failed to play -- " << Mix_GetError() );
+			NV_LOG_WARNING( "SDL_mixer failed to play -- ", Mix_GetError() );
 		}
 		else
@@ -67,5 +67,5 @@
 		if ( channel == -1 )
 		{
-			NV_LOG( LOG_WARNING, "SDL_mixer failed to play -- " << Mix_GetError() );
+			NV_LOG_WARNING( "SDL_mixer failed to play -- ", Mix_GetError() );
 		}
 		else
@@ -91,10 +91,10 @@
 	if ( Mix_LoadWAV_RW == nullptr || SDL_RWFromFile == nullptr ) 
 	{
-		NV_LOG( LOG_ERROR, "SDL_mixer not loaded!" );
+		NV_LOG_ERROR( "SDL_mixer not loaded!" );
 	}
 	Mix_Chunk *sample = Mix_LoadWAV_RW(SDL_RWFromFile(a_path.c_str(), "rb"), 1);
 	if ( sample == nullptr )
 	{
-		NV_LOG( LOG_ERROR, "SDL_mixer failed to load sample '" << a_path << "' -- " << Mix_GetError() );
+		NV_LOG_ERROR( "SDL_mixer failed to load sample '", a_path, "' -- ", Mix_GetError() );
 		return sound();
 	}
Index: trunk/src/sdl/sdl_window.cc
===================================================================
--- trunk/src/sdl/sdl_window.cc	(revision 357)
+++ trunk/src/sdl/sdl_window.cc	(revision 365)
@@ -38,5 +38,5 @@
 	if ( m_handle == 0 )
 	{
-		NV_LOG( LOG_CRITICAL, "Video mode set failed: " << SDL_GetError( ) );
+		NV_LOG_CRITICAL( "Video mode set failed: ", SDL_GetError( ) );
 		return; // TODO: Error report
 	}
@@ -56,13 +56,13 @@
 	if ( ctx_handle == 0 )
 	{
-		NV_LOG( LOG_CRITICAL, "GL Context creation failed: " << SDL_GetError( ) );
+		NV_LOG_CRITICAL( "GL Context creation failed: ", SDL_GetError( ) );
 		return; // TODO: Error report
 	}
 
 	nv::load_gl_library();
-	NV_LOG( LOG_INFO, "OpenGL Vendor       : " << glGetString(GL_VENDOR) );
-	NV_LOG( LOG_INFO, "OpenGL Renderer     : " << glGetString(GL_RENDERER) );
-	NV_LOG( LOG_INFO, "OpenGL Version      : " << glGetString(GL_VERSION) );
-	NV_LOG( LOG_INFO, "OpenGL GLSL Version : " << glGetString(GL_SHADING_LANGUAGE_VERSION) );
+	NV_LOG_INFO( "OpenGL Vendor       : ", (const char*)glGetString(GL_VENDOR) );
+	NV_LOG_INFO( "OpenGL Renderer     : ", (const char*)glGetString( GL_RENDERER ) );
+	NV_LOG_INFO( "OpenGL Version      : ", (const char*)glGetString( GL_VERSION ) );
+	NV_LOG_INFO( "OpenGL GLSL Version : ", (const char*)glGetString( GL_SHADING_LANGUAGE_VERSION ) );
 	SDL_GL_SetSwapInterval(1);
 
Index: trunk/src/sdl/sdl_window_manager.cc
===================================================================
--- trunk/src/sdl/sdl_window_manager.cc	(revision 357)
+++ trunk/src/sdl/sdl_window_manager.cc	(revision 365)
@@ -19,5 +19,5 @@
 	if ( SDL_Init(0) < 0 )
 	{
-		NV_LOG( LOG_CRITICAL, "SDL initialization failed: " << SDL_GetError( ) );
+		NV_LOG_CRITICAL( "SDL initialization failed: ", SDL_GetError( ) );
 		return; // TODO: Error report
 	}