summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-26 09:01:36 +0100
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-26 09:01:36 +0100
commitb6baff6aec6c4f5c8f7a012f71cb36287ef01960 (patch)
tree81abdcf17b167cfcf599765b4be4d6de307bd8eb
parentaad2ec90416e9f41d0e500940572d8b644205a52 (diff)
downloadscilab-b6baff6aec6c4f5c8f7a012f71cb36287ef01960.zip
scilab-b6baff6aec6c4f5c8f7a012f71cb36287ef01960.tar.gz
No longer build libscirenderer-disable.la (useless) + removed dead code (gw_renderer) which was causing the error 'ld: codegen problem, can't use rel32 to external symbol' under Mac OS X
-rw-r--r--scilab/modules/Makefile.am1
-rw-r--r--scilab/modules/renderer/Makefile.am15
-rw-r--r--scilab/modules/renderer/includes/gw_renderer.h25
-rw-r--r--scilab/modules/renderer/sci_gateway/c/gw_renderer.c30
-rw-r--r--scilab/modules/renderer/src/norenderer/norenderer.c23
5 files changed, 1 insertions, 93 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index 9e29984..b03d823 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -137,7 +137,6 @@ GUI_LIBS += $(top_builddir)/modules/hdf5/libscihdf5-forceload.la
137endif 137endif
138 138
139NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \ 139NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
140 $(top_builddir)/modules/renderer/libscirenderer-disable.la \
141 $(top_builddir)/modules/graphics/libscigraphics-disable.la \ 140 $(top_builddir)/modules/graphics/libscigraphics-disable.la \
142 $(top_builddir)/modules/graphic_export/libscigraphic_export-disable.la \ 141 $(top_builddir)/modules/graphic_export/libscigraphic_export-disable.la \
143 $(top_builddir)/modules/console/libsciconsole-disable.la \ 142 $(top_builddir)/modules/console/libsciconsole-disable.la \
diff --git a/scilab/modules/renderer/Makefile.am b/scilab/modules/renderer/Makefile.am
index 43017d1..b1637ea 100644
--- a/scilab/modules/renderer/Makefile.am
+++ b/scilab/modules/renderer/Makefile.am
@@ -282,9 +282,6 @@ src/jni/SubwinBackgroundDrawerGL.cpp \
282src/cpp/subwinDrawing/SubwinBackgroundDrawerJavaMapper.cpp \ 282src/cpp/subwinDrawing/SubwinBackgroundDrawerJavaMapper.cpp \
283src/cpp/subwinDrawing/SubwinBackgroundDrawerJoGL.cpp 283src/cpp/subwinDrawing/SubwinBackgroundDrawerJoGL.cpp
284 284
285# List of the gateway c files
286GATEWAY_C_SOURCES = sci_gateway/c/gw_renderer.c
287
288# Includes need for the compilation 285# Includes need for the compilation
289libscirenderer_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \ 286libscirenderer_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
290 -I$(srcdir)/includes/ \ 287 -I$(srcdir)/includes/ \
@@ -372,19 +369,9 @@ if GIWS
372BUILT_SOURCES=giws 369BUILT_SOURCES=giws
373endif 370endif
374 371
375# All the sources needed by libscirenderer.la
376libscirenderer_disable_la_SOURCES = src/norenderer/norenderer.c
377
378libscirenderer_disable_la_CPPFLAGS = -I$(top_srcdir)/modules/output_stream/includes
379libscirenderer_disable_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
380
381# Name of the future library (.la will be replace by .so, .a, etc regarding
382# the system)
383pkglib_LTLIBRARIES = libscirenderer-disable.la
384
385if GUI 372if GUI
386USEANT=1 373USEANT=1
387pkglib_LTLIBRARIES += libscirenderer.la 374pkglib_LTLIBRARIES = libscirenderer.la
388endif 375endif
389 376
390libscirenderer_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) 377libscirenderer_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
diff --git a/scilab/modules/renderer/includes/gw_renderer.h b/scilab/modules/renderer/includes/gw_renderer.h
deleted file mode 100644
index 8dfdb9c..0000000
--- a/scilab/modules/renderer/includes/gw_renderer.h
+++ /dev/null
@@ -1,25 +0,0 @@
1/*
2 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3 * Copyright (C) 2007 - INRIA - Sylvestre LEDRU
4 * Copyright (C) 2007 - INRIA - Allan CORNET
5 * Skeleton for the gateway header file (declaration of the "links"
6 * between Scilab and the "library"
7 *
8 * This file must be used under the terms of the CeCILL.
9 * This source file is licensed as described in the file COPYING, which
10 * you should have received as part of this distribution. The terms
11 * are also available at
12 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
13 *
14 */
15
16#ifndef __GW_RENDERER__
17#define __GW_RENDERER__
18/*--------------------------------------------------------------------------*/
19#include "dynlib_renderer.h"
20/*--------------------------------------------------------------------------*/
21int gw_renderer(void);
22/*--------------------------------------------------------------------------*/
23#endif /* __GW_RENDERER__ */
24
25
diff --git a/scilab/modules/renderer/sci_gateway/c/gw_renderer.c b/scilab/modules/renderer/sci_gateway/c/gw_renderer.c
deleted file mode 100644
index 8e7c090..0000000
--- a/scilab/modules/renderer/sci_gateway/c/gw_renderer.c
+++ /dev/null
@@ -1,30 +0,0 @@
1/*
2 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3 * Copyright (C) 2007 - INRIA
4 *
5 * This file must be used under the terms of the CeCILL.
6 * This source file is licensed as described in the file COPYING, which
7 * you should have received as part of this distribution. The terms
8 * are also available at
9 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10 *
11 */
12 /*--------------------------------------------------------------------------*/
13#include "gw_renderer.h"
14#include "stack-c.h"
15#include "callFunctionFromGateway.h"
16/*--------------------------------------------------------------------------*/
17#define RENDERER_TAB_SIZE 0
18static gw_generic_table Tab[RENDERER_TAB_SIZE]=
19{
20
21};
22/*--------------------------------------------------------------------------*/
23/* This gateway is not used and it should be not built */
24int gw_renderer(void)
25{
26 Rhs = Max(0, Rhs);
27 callFunctionFromGateway(Tab,RENDERER_TAB_SIZE);
28 return 0;
29}
30/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/renderer/src/norenderer/norenderer.c b/scilab/modules/renderer/src/norenderer/norenderer.c
deleted file mode 100644
index 9981da4..0000000
--- a/scilab/modules/renderer/src/norenderer/norenderer.c
+++ /dev/null
@@ -1,23 +0,0 @@
1/*
2 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3 * Copyright (C) 2007 - INRIA - Allan CORNET
4 *
5 * This file must be used under the terms of the CeCILL.
6 * This source file is licensed as described in the file COPYING, which
7 * you should have received as part of this distribution. The terms
8 * are also available at
9 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10 *
11 */
12
13#include "norenderer.h"
14#include "Scierror.h"
15#include "localization.h"
16/*--------------------------------------------------------------------------*/
17int gw_renderer()
18{
19 Scierror(999,_("Scilab Renderer module not installed.\n"));
20 return 0;
21}
22/*--------------------------------------------------------------------------*/
23