Browse Source

Remove unneccasary CMake Cocoa detection and temporary log messages.

Lloyd Weehuizen 15 years ago
parent
commit
05cfd77e0b
2 changed files with 1 additions and 13 deletions
  1. 0 9
      Build/CMakeLists.txt
  2. 1 4
      Samples/shell/src/ShellRenderInterfaceOpenGL.cpp

+ 0 - 9
Build/CMakeLists.txt

@@ -228,15 +228,6 @@ if(BUILD_SAMPLES)
         		${Carbon_LIBRARIES}
         		${Carbon_LIBRARIES}
         	)
         	)
     	endif()
     	endif()
-    	
-    	find_package(Cocoa REQUIRED)
-    	
-    	if (Cocoa_FOUND)
-    		include_directories(${Cocoa_INCLUDE_DIR})
-        	list(APPEND sample_LIBRARIES
-        		${Cocoa_LIBRARIES}
-        	)
-    	endif()
     else()
     else()
     	find_package(X11 REQUIRED)
     	find_package(X11 REQUIRED)
         if (X11_FOUND)
         if (X11_FOUND)

+ 1 - 4
Samples/shell/src/ShellRenderInterfaceOpenGL.cpp

@@ -193,10 +193,7 @@ bool ShellRenderInterfaceOpenGL::GenerateTexture(Rocket::Core::TextureHandle& te
 		printf("Failed to generate textures\n");
 		printf("Failed to generate textures\n");
 		return false;
 		return false;
 	}
 	}
-	else
-	{
-		printf("Texture id: %d\n", texture_id);
-	}
+
 	glBindTexture(GL_TEXTURE_2D, texture_id);
 	glBindTexture(GL_TEXTURE_2D, texture_id);
 
 
 	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, source_dimensions.x, source_dimensions.y, 0, GL_RGBA, GL_UNSIGNED_BYTE, source);
 	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, source_dimensions.x, source_dimensions.y, 0, GL_RGBA, GL_UNSIGNED_BYTE, source);