Permalink
Browse files

Enabling logo

  • Loading branch information...
1 parent 75b065f commit 5e66dbaa0bf102d894078c0c4a7bfc528a296b7b @wedesoft committed Nov 12, 2010
Showing with 2 additions and 4 deletions.
  1. +2 −2 Rakefile
  2. +0 −2 ext/x11window.cc
View
4 Rakefile
@@ -7,7 +7,7 @@ require 'rake/loaders/makefile'
require 'rbconfig'
PKG_NAME = 'hornetseye-xorg'
-PKG_VERSION = '0.3.0'
+PKG_VERSION = '0.3.1'
CFG = RbConfig::CONFIG
CXX = ENV[ 'CXX' ] || 'g++'
RB_FILES = FileList[ 'lib/**/*.rb' ]
@@ -46,7 +46,7 @@ desc 'Compile Ruby extension (default)'
task :all => [ SO_FILE ]
file SO_FILE => OBJ do |t|
- sh "#{CXX} -shared -o #{t.name} #{OBJ} -lGLU -lGL -lX11 -lXv #{$LIBRUBYARG}"
+ sh "#{CXX} -shared -o #{t.name} #{OBJ} -lGLU -lGL -lX11 -lXv -lXpm #{$LIBRUBYARG}"
end
task :test => [ SO_FILE ]
View
2 ext/x11window.cc
@@ -260,7 +260,6 @@ X11Window::X11Window( X11DisplayPtr display, X11PainterPtr painter,
wmProtocols = XInternAtom( display->get(), "WM_PROTOCOLS", False );
wmDeleteWindow = XInternAtom( display->get(), "WM_DELETE_WINDOW", False );
XSetWMProtocols( display->get(), m_window, &wmDeleteWindow, 1 );
-#ifdef HAVE_XPM
XWMHints wmHints;
XpmCreatePixmapFromData( display->get(), m_window,
(char **)hornetseye_xpm,
@@ -269,7 +268,6 @@ X11Window::X11Window( X11DisplayPtr display, X11PainterPtr painter,
0 );
wmHints.flags = IconPixmapHint | IconMaskHint;
XSetWMHints( display->get(), m_window, &wmHints );
-#endif
try {

0 comments on commit 5e66dba

Please sign in to comment.