On Thu, Apr 21, 2011 at 01:53:34PM +0200, Christophe Fergeau wrote: > client/ contains several .cpp file which only #include a .c file > of the same name. This is unusual and seems to only be done to > get C++ name mangling on the symbols defined in the C file. > Now that all headers files in common/ use extern "C", these > wrappers are no longer useful.
never realized this. nice fix. > --- > client/Makefile.am | 12 ------------ > client/canvas_utils.cpp | 25 ------------------------- > client/gdi_canvas.cpp | 24 ------------------------ > client/gl_canvas.cpp | 20 -------------------- > client/glc.cpp | 20 -------------------- > client/lines.cpp | 24 ------------------------ > client/lz.cpp | 20 -------------------- > client/marshaller.cpp | 24 ------------------------ > client/mem.cpp | 24 ------------------------ > client/pixman_utils.cpp | 25 ------------------------- > client/quic.cpp | 20 -------------------- > client/region.cpp | 20 -------------------- > client/rop3.cpp | 20 -------------------- > client/sw_canvas.cpp | 24 ------------------------ > client/windows/Makefile.am | 26 +++++++++++++------------- > client/x11/Makefile.am | 24 ++++++++++++------------ > 16 files changed, 25 insertions(+), 327 deletions(-) > delete mode 100644 client/canvas_utils.cpp > delete mode 100644 client/gdi_canvas.cpp > delete mode 100644 client/gl_canvas.cpp > delete mode 100644 client/glc.cpp > delete mode 100644 client/lines.cpp > delete mode 100644 client/lz.cpp > delete mode 100644 client/marshaller.cpp > delete mode 100644 client/mem.cpp > delete mode 100644 client/pixman_utils.cpp > delete mode 100644 client/quic.cpp > delete mode 100644 client/region.cpp > delete mode 100644 client/rop3.cpp > delete mode 100644 client/sw_canvas.cpp > > diff --git a/client/Makefile.am b/client/Makefile.am > index a5effed..bbea61f 100644 > --- a/client/Makefile.am > +++ b/client/Makefile.am > @@ -19,8 +19,6 @@ generated_marshallers1.cpp: $(top_srcdir)/spice1.proto > > if SUPPORT_GL > GL_SRCS = \ > - gl_canvas.cpp \ > - glc.cpp \ > red_gl_canvas.cpp \ > red_gl_canvas.h \ > red_pixmap_gl.h > @@ -42,12 +40,8 @@ RED_COMMON_SRCS = \ > audio_channels.h \ > audio_devices.h \ > cache.hpp \ > - sw_canvas.cpp \ > - pixman_utils.cpp \ > - lines.cpp \ > canvas.cpp \ > canvas.h \ > - canvas_utils.cpp \ > red_sw_canvas.cpp \ > red_sw_canvas.h \ > client_net_socket.cpp \ > @@ -59,7 +53,6 @@ RED_COMMON_SRCS = \ > marshallers.h \ > generated_demarshallers.cpp \ > generated_demarshallers1.cpp \ > - marshaller.cpp \ > generated_marshallers.cpp \ > generated_marshallers1.cpp \ > controller.cpp \ > @@ -85,7 +78,6 @@ RED_COMMON_SRCS = \ > inputs_handler.h \ > jpeg_decoder.cpp \ > jpeg_decoder.h \ > - lz.cpp \ > monitor.cpp \ > monitor.h \ > mem.cpp \ > @@ -99,7 +91,6 @@ RED_COMMON_SRCS = \ > playback_channel.cpp \ > process_loop.cpp \ > process_loop.h \ > - quic.cpp \ > read_write_mutex.h \ > record_channel.cpp \ > red_channel.cpp \ > @@ -114,8 +105,6 @@ RED_COMMON_SRCS = \ > red_pixmap.h \ > red_types.h \ > red_window.h \ > - region.cpp \ > - rop3.cpp \ > screen.cpp \ > screen.h \ > screen_layer.cpp \ > @@ -134,7 +123,6 @@ RED_COMMON_SRCS = \ > $(NULL) > > GDI_FILES = \ > - gdi_canvas.cpp \ > red_gdi_canvas.cpp \ > red_gdi_canvas.h \ > red_pixmap_gdi.h \ > diff --git a/client/canvas_utils.cpp b/client/canvas_utils.cpp > deleted file mode 100644 > index 237c45c..0000000 > --- a/client/canvas_utils.cpp > +++ /dev/null > @@ -1,25 +0,0 @@ > -/* > - Copyright (C) 2009 Red Hat, Inc. > - > - This library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - This library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with this library; if not, see > <http://www.gnu.org/licenses/>. > -*/ > - > -#include "common.h" > -#include "utils.h" > - > - > -#define CANVAS_ERROR(format, ...) THROW(format, ## __VA_ARGS__) > - > -#include "../common/canvas_utils.c" > - > diff --git a/client/gdi_canvas.cpp b/client/gdi_canvas.cpp > deleted file mode 100644 > index 9a6e6f7..0000000 > --- a/client/gdi_canvas.cpp > +++ /dev/null > @@ -1,24 +0,0 @@ > -/* > - Copyright (C) 2009 Red Hat, Inc. > - > - This library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - This library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with this library; if not, see > <http://www.gnu.org/licenses/>. > -*/ > - > -#include "common.h" > -#include "utils.h" > - > -#define CANVAS_ERROR(format, ...) THROW(format, ## __VA_ARGS__) > - > -#include "../common/gdi_canvas.c" > - > diff --git a/client/gl_canvas.cpp b/client/gl_canvas.cpp > deleted file mode 100644 > index 45fa32e..0000000 > --- a/client/gl_canvas.cpp > +++ /dev/null > @@ -1,20 +0,0 @@ > -/* > - Copyright (C) 2009 Red Hat, Inc. > - > - This library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - This library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with this library; if not, see > <http://www.gnu.org/licenses/>. > -*/ > - > -#include "common.h" > -#include "../common/gl_canvas.c" > - > diff --git a/client/glc.cpp b/client/glc.cpp > deleted file mode 100644 > index a040c7e..0000000 > --- a/client/glc.cpp > +++ /dev/null > @@ -1,20 +0,0 @@ > -/* > - Copyright (C) 2009 Red Hat, Inc. > - > - This library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - This library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with this library; if not, see > <http://www.gnu.org/licenses/>. > -*/ > - > -#include "common.h" > -#include "../common/glc.c" > - > diff --git a/client/lines.cpp b/client/lines.cpp > deleted file mode 100644 > index 40769c1..0000000 > --- a/client/lines.cpp > +++ /dev/null > @@ -1,24 +0,0 @@ > -/* > - Copyright (C) 2009 Red Hat, Inc. > - > - This library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - This library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with this library; if not, see > <http://www.gnu.org/licenses/>. > -*/ > - > -#include "common.h" > -#include "utils.h" > - > - > -#define CANVAS_ERROR(format, ...) THROW(format, ## __VA_ARGS__) > - > -#include "../common/lines.c" > diff --git a/client/lz.cpp b/client/lz.cpp > deleted file mode 100644 > index 69f5af4..0000000 > --- a/client/lz.cpp > +++ /dev/null > @@ -1,20 +0,0 @@ > -/* > - Copyright (C) 2009 Red Hat, Inc. > - > - This library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - This library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with this library; if not, see > <http://www.gnu.org/licenses/>. > -*/ > - > -#include "common.h" > -#include "../common/lz.c" > - > diff --git a/client/marshaller.cpp b/client/marshaller.cpp > deleted file mode 100644 > index 14bd096..0000000 > --- a/client/marshaller.cpp > +++ /dev/null > @@ -1,24 +0,0 @@ > -/* > - Copyright (C) 2009 Red Hat, Inc. > - > - This library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - This library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with this library; if not, see > <http://www.gnu.org/licenses/>. > -*/ > - > -#include "common.h" > -#include "utils.h" > - > - > -#define CANVAS_ERROR(format, ...) THROW(format, ## __VA_ARGS__) > - > -#include "../common/marshaller.c" > diff --git a/client/mem.cpp b/client/mem.cpp > deleted file mode 100644 > index 9e8b7d9..0000000 > --- a/client/mem.cpp > +++ /dev/null > @@ -1,24 +0,0 @@ > -/* > - Copyright (C) 2009 Red Hat, Inc. > - > - This library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - This library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with this library; if not, see > <http://www.gnu.org/licenses/>. > -*/ > - > -#include "common.h" > -#include "utils.h" > - > -#define MALLOC_ERROR(format, ...) THROW(format, ## __VA_ARGS__) > - > -#include "../common/mem.c" > - > diff --git a/client/pixman_utils.cpp b/client/pixman_utils.cpp > deleted file mode 100644 > index 83acf87..0000000 > --- a/client/pixman_utils.cpp > +++ /dev/null > @@ -1,25 +0,0 @@ > -/* > - Copyright (C) 2009 Red Hat, Inc. > - > - This library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - This library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with this library; if not, see > <http://www.gnu.org/licenses/>. > -*/ > - > -#include "common.h" > -#include "utils.h" > - > - > -#define CANVAS_ERROR(format, ...) THROW(format, ## __VA_ARGS__) > - > -#include "../common/pixman_utils.c" > - > diff --git a/client/quic.cpp b/client/quic.cpp > deleted file mode 100644 > index 6ecee35..0000000 > --- a/client/quic.cpp > +++ /dev/null > @@ -1,20 +0,0 @@ > -/* > - Copyright (C) 2009 Red Hat, Inc. > - > - This library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - This library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with this library; if not, see > <http://www.gnu.org/licenses/>. > -*/ > - > -#include "common.h" > -#include "../common/quic.c" > - > diff --git a/client/region.cpp b/client/region.cpp > deleted file mode 100644 > index 415e843..0000000 > --- a/client/region.cpp > +++ /dev/null > @@ -1,20 +0,0 @@ > -/* > - Copyright (C) 2009 Red Hat, Inc. > - > - This library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - This library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with this library; if not, see > <http://www.gnu.org/licenses/>. > -*/ > - > -#include "common.h" > -#include "../common/region.c" > - > diff --git a/client/rop3.cpp b/client/rop3.cpp > deleted file mode 100644 > index e48bfc3..0000000 > --- a/client/rop3.cpp > +++ /dev/null > @@ -1,20 +0,0 @@ > -/* > - Copyright (C) 2009 Red Hat, Inc. > - > - This library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - This library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with this library; if not, see > <http://www.gnu.org/licenses/>. > -*/ > - > -#include "common.h" > -#include "../common/rop3.c" > - > diff --git a/client/sw_canvas.cpp b/client/sw_canvas.cpp > deleted file mode 100644 > index 33ec272..0000000 > --- a/client/sw_canvas.cpp > +++ /dev/null > @@ -1,24 +0,0 @@ > -/* > - Copyright (C) 2009 Red Hat, Inc. > - > - This library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - This library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with this library; if not, see > <http://www.gnu.org/licenses/>. > -*/ > - > -#include "common.h" > -#include "utils.h" > - > -#define CANVAS_ERROR(format, ...) THROW(format, ## __VA_ARGS__) > - > -#include "../common/sw_canvas.c" > - > diff --git a/client/windows/Makefile.am b/client/windows/Makefile.am > index 6d69511..eae0bbe 100644 > --- a/client/windows/Makefile.am > +++ b/client/windows/Makefile.am > @@ -34,15 +34,15 @@ RED_COMMON_SRCS = \ > $(CLIENT_DIR)/demarshallers.h \ > $(CLIENT_DIR)/generated_demarshallers.cpp \ > $(CLIENT_DIR)/generated_demarshallers1.cpp \ > - $(CLIENT_DIR)/marshaller.cpp \ > + $(COMMON_DIR)/marshaller.c \ > $(CLIENT_DIR)/marshallers.h \ > $(CLIENT_DIR)/generated_marshallers.cpp \ > $(CLIENT_DIR)/generated_marshallers1.cpp \ > - $(CLIENT_DIR)/sw_canvas.cpp \ > + $(COMMON_DIR)/sw_canvas.c \ > $(CLIENT_DIR)/canvas.cpp \ > - $(CLIENT_DIR)/gdi_canvas.cpp \ > + $(COMMON_DIR)/gdi_canvas.c \ > $(CLIENT_DIR)/canvas.h \ > - $(CLIENT_DIR)/canvas_utils.cpp \ > + $(COMMON_DIR)/canvas_utils.c \ > $(CLIENT_DIR)/red_sw_canvas.cpp \ > $(CLIENT_DIR)/red_sw_canvas.h \ > $(CLIENT_DIR)/cmd_line_parser.cpp \ > @@ -72,21 +72,21 @@ RED_COMMON_SRCS = \ > $(CLIENT_DIR)/inputs_handler.h \ > $(CLIENT_DIR)/jpeg_decoder.cpp \ > $(CLIENT_DIR)/jpeg_decoder.h \ > - $(CLIENT_DIR)/lz.cpp \ > - $(CLIENT_DIR)/lines.cpp \ > + $(COMMON_DIR)/lz.c \ > + $(COMMON_DIR)/lines.c \ > $(CLIENT_DIR)/monitor.cpp \ > $(CLIENT_DIR)/monitor.h \ > - $(CLIENT_DIR)/mem.cpp \ > + $(COMMON_DIR)/mem.c \ > $(CLIENT_DIR)/menu.cpp \ > $(CLIENT_DIR)/menu.h \ > $(CLIENT_DIR)/mjpeg_decoder.h \ > $(CLIENT_DIR)/mjpeg_decoder.cpp \ > $(CLIENT_DIR)/pixels_source.h \ > - $(CLIENT_DIR)/pixman_utils.cpp \ > + $(COMMON_DIR)/pixman_utils.c \ > $(CLIENT_DIR)/platform.h \ > $(CLIENT_DIR)/playback_channel.cpp \ > $(CLIENT_DIR)/process_loop.cpp \ > - $(CLIENT_DIR)/quic.cpp \ > + $(COMMON_DIR)/quic.c \ > $(CLIENT_DIR)/record_channel.cpp \ > $(CLIENT_DIR)/red_channel.cpp \ > $(CLIENT_DIR)/red_channel.h \ > @@ -101,8 +101,8 @@ RED_COMMON_SRCS = \ > $(CLIENT_DIR)/red_pixmap.h \ > $(CLIENT_DIR)/red_types.h \ > $(CLIENT_DIR)/red_window.h \ > - $(CLIENT_DIR)/region.cpp \ > - $(CLIENT_DIR)/rop3.cpp \ > + $(COMMON_DIR)/region.c \ > + $(COMMON_DIR)/rop3.c \ > $(CLIENT_DIR)/screen.cpp \ > $(CLIENT_DIR)/screen.h \ > $(CLIENT_DIR)/screen_layer.cpp \ > @@ -137,8 +137,8 @@ endif > > if SUPPORT_GL > RED_OGL_SRCS = \ > - $(CLIENT_DIR)/gl_canvas.cpp \ > - $(CLIENT_DIR)/glc.cpp \ > + $(COMMON_DIR)/gl_canvas.c \ > + $(COMMON_DIR)/glc.c \ > $(CLIENT_DIR)/red_gl_canvas.cpp \ > $(CLIENT_DIR)/red_gl_canvas.h \ > $(CLIENT_DIR)/red_pixmap_gl.h > diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am > index 7504833..54d05ce 100644 > --- a/client/x11/Makefile.am > +++ b/client/x11/Makefile.am > @@ -41,14 +41,14 @@ RED_COMMON_SRCS = \ > $(CLIENT_DIR)/demarshallers.h \ > $(CLIENT_DIR)/generated_demarshallers.cpp \ > $(CLIENT_DIR)/generated_demarshallers1.cpp \ > - $(CLIENT_DIR)/marshaller.cpp \ > + $(COMMON_DIR)/marshaller.c \ > $(CLIENT_DIR)/marshallers.h \ > $(CLIENT_DIR)/generated_marshallers.cpp \ > $(CLIENT_DIR)/generated_marshallers1.cpp \ > - $(CLIENT_DIR)/sw_canvas.cpp \ > + $(COMMON_DIR)/sw_canvas.c \ > $(CLIENT_DIR)/canvas.cpp \ > $(CLIENT_DIR)/canvas.h \ > - $(CLIENT_DIR)/canvas_utils.cpp \ > + $(COMMON_DIR)/canvas_utils.c \ > $(CLIENT_DIR)/red_sw_canvas.cpp \ > $(CLIENT_DIR)/red_sw_canvas.h \ > $(CLIENT_DIR)/cmd_line_parser.cpp \ > @@ -78,21 +78,21 @@ RED_COMMON_SRCS = \ > $(CLIENT_DIR)/inputs_handler.h \ > $(CLIENT_DIR)/jpeg_decoder.cpp \ > $(CLIENT_DIR)/jpeg_decoder.h \ > - $(CLIENT_DIR)/lz.cpp \ > - $(CLIENT_DIR)/lines.cpp \ > + $(COMMON_DIR)/lz.c \ > + $(COMMON_DIR)/lines.c \ > $(CLIENT_DIR)/monitor.cpp \ > $(CLIENT_DIR)/monitor.h \ > - $(CLIENT_DIR)/mem.cpp \ > + $(COMMON_DIR)/mem.c \ > $(CLIENT_DIR)/menu.cpp \ > $(CLIENT_DIR)/menu.h \ > $(CLIENT_DIR)/mjpeg_decoder.h \ > $(CLIENT_DIR)/mjpeg_decoder.cpp \ > $(CLIENT_DIR)/pixels_source.h \ > - $(CLIENT_DIR)/pixman_utils.cpp \ > + $(COMMON_DIR)/pixman_utils.c \ > $(CLIENT_DIR)/platform.h \ > $(CLIENT_DIR)/playback_channel.cpp \ > $(CLIENT_DIR)/process_loop.cpp \ > - $(CLIENT_DIR)/quic.cpp \ > + $(COMMON_DIR)/quic.c \ > $(CLIENT_DIR)/record_channel.cpp \ > $(CLIENT_DIR)/red_channel.cpp \ > $(CLIENT_DIR)/red_channel.h \ > @@ -106,8 +106,8 @@ RED_COMMON_SRCS = \ > $(CLIENT_DIR)/red_pixmap.h \ > $(CLIENT_DIR)/red_types.h \ > $(CLIENT_DIR)/red_window.h \ > - $(CLIENT_DIR)/region.cpp \ > - $(CLIENT_DIR)/rop3.cpp \ > + $(COMMON_DIR)/region.c \ > + $(COMMON_DIR)/rop3.c \ > $(CLIENT_DIR)/screen.cpp \ > $(CLIENT_DIR)/screen.h \ > $(CLIENT_DIR)/screen_layer.cpp \ > @@ -150,8 +150,8 @@ endif > > if SUPPORT_GL > RED_OGL_SRCS = \ > - $(CLIENT_DIR)/gl_canvas.cpp \ > - $(CLIENT_DIR)/glc.cpp \ > + $(COMMON_DIR)/gl_canvas.c \ > + $(COMMON_DIR)/glc.c \ > $(CLIENT_DIR)/red_gl_canvas.cpp \ > $(CLIENT_DIR)/red_gl_canvas.h \ > $(CLIENT_DIR)/red_pixmap_gl.h \ > -- > 1.7.4.4 > > _______________________________________________ > Spice-devel mailing list > Spice-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/spice-devel _______________________________________________ Spice-devel mailing list Spice-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/spice-devel