Changeset 605Tweet

Timestamp:

May 8, 2011, 5:32:32 PM (6 years ago)

Author:

sam

Message:

build: fix errors in the makefiles that prevent `make dist' from working.

Location:

abuse/trunk/src

Files:

• Makefile.am (modified) (1 diff)
• imlib/Makefile.am (modified) (1 diff)
• imlib/visobj.cpp (deleted)
• imlib/visobj.h (modified) (1 diff)

abuse/trunk/src/Makefile.am

@@ -60 +60 @@
     gamma.cpp gamma.h \
     id.h netface.h isllist.h sbar.h \
-    nfserver.h exitproc.h \
+    nfserver.h \
     \
-    ui/volumewindow.cpp volumewindow.h \
+    ui/volumewindow.cpp ui/volumewindow.h \
     $(NULL)
 

abuse/trunk/src/imlib/Makefile.am

@@ -26 +26 @@
     jwindow.cpp jwindow.h \
     video.cpp video.h \
-    event.h mouse.h timing.h jdir.h \
+    event.h mouse.h timing.h jdir.h visobj.h \
     $(NULL)
 

abuse/trunk/src/imlib/visobj.h

@@ -17 +17 @@
 class visual_object
 {
-  public :
-  virtual void draw(image *screen, int x, int y, Filter *f) = 0;
-  virtual int width() = 0;
-  virtual int height() = 0;
-  virtual ~visual_object() { }
-} ;
-
-
-
-class image_visual : public visual_object
-{
-  public :
-  image *im;
-
-  image_visual(image *img) { im=img; }
-  virtual void draw(image *screen, int x, int y, Filter *f);
-  virtual int width() { return im->Size().x; }
-  virtual int height() { return im->Size().y; }
-} ;
-
-
-class string_visual : public visual_object
-{
-  char *st;
-  int color;
-  int w,h;
-  public :
-  string_visual(char *string, int Color);
-  virtual void draw(image *screen, int x, int y, Filter *f);
-  virtual int width();
-  virtual int height();
-} ;
-
+public:
+    virtual void draw(image *screen, int x, int y, Filter *f) = 0;
+    virtual int width() = 0;
+    virtual int height() = 0;
+    virtual ~visual_object() { }
+};
 
 #endif
+