summaryrefslogtreecommitdiffstats
path: root/scilab/modules/shell
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-03-30 14:57:21 +0200
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-03-30 14:57:21 +0200
commitfaa27411e360a379cb4522d3e6b52c133ccee522 (patch)
tree7018b97c7a8ce59079e1c8b831320d487057b64c /scilab/modules/shell
parentd3d4d7de9fe3b421686133a084183fcbfbc677b2 (diff)
downloadscilab-faa27411e360a379cb4522d3e6b52c133ccee522.zip
scilab-faa27411e360a379cb4522d3e6b52c133ccee522.tar.gz
Under Mac OS X, add the option -msse2 while building the shell module. It fixes the build error described in bug #6839
Diffstat (limited to 'scilab/modules/shell')
-rw-r--r--scilab/modules/shell/Makefile.am3
-rw-r--r--scilab/modules/shell/Makefile.in33
2 files changed, 18 insertions, 18 deletions
diff --git a/scilab/modules/shell/Makefile.am b/scilab/modules/shell/Makefile.am
index 6c1588c..5383825 100644
--- a/scilab/modules/shell/Makefile.am
+++ b/scilab/modules/shell/Makefile.am
@@ -55,6 +55,9 @@ libscishell_la_CFLAGS= $(JAVA_JNI_INCLUDE) \
55 -I$(top_srcdir)/modules/fileio/src/c/ \ 55 -I$(top_srcdir)/modules/fileio/src/c/ \
56 -I$(top_srcdir)/modules/api_scilab/includes \ 56 -I$(top_srcdir)/modules/api_scilab/includes \
57 -I$(top_srcdir)/modules/fileio/includes/ 57 -I$(top_srcdir)/modules/fileio/includes/
58if IS_MACOSX
59libscishell_la_CFLAGS += -msse2
60endif
58 61
59# Name of the future library (.la will be replace by .so, .a, etc regarding 62# Name of the future library (.la will be replace by .so, .a, etc regarding
60# the system) 63# the system)
diff --git a/scilab/modules/shell/Makefile.in b/scilab/modules/shell/Makefile.in
index 09a985f..434f12a 100644
--- a/scilab/modules/shell/Makefile.in
+++ b/scilab/modules/shell/Makefile.in
@@ -60,9 +60,10 @@ POST_UNINSTALL = :
60build_triplet = @build@ 60build_triplet = @build@
61host_triplet = @host@ 61host_triplet = @host@
62@IS_MACOSX_TRUE@am__append_1 = src/c/others/initMacOSXEnv.c 62@IS_MACOSX_TRUE@am__append_1 = src/c/others/initMacOSXEnv.c
63@IS_MACOSX_TRUE@am__append_2 = -msse2
63DIST_COMMON = $(libscishell_la_include_HEADERS) $(srcdir)/Makefile.am \ 64DIST_COMMON = $(libscishell_la_include_HEADERS) $(srcdir)/Makefile.am \
64 $(srcdir)/Makefile.in $(top_srcdir)/Makefile.incl.am 65 $(srcdir)/Makefile.in $(top_srcdir)/Makefile.incl.am
65@NEED_JAVA_TRUE@am__append_2 = java 66@NEED_JAVA_TRUE@am__append_3 = java
66subdir = modules/shell 67subdir = modules/shell
67ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 68ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
68am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 69am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
@@ -290,7 +291,6 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
290PACKAGE_NAME = @PACKAGE_NAME@ 291PACKAGE_NAME = @PACKAGE_NAME@
291PACKAGE_STRING = @PACKAGE_STRING@ 292PACKAGE_STRING = @PACKAGE_STRING@
292PACKAGE_TARNAME = @PACKAGE_TARNAME@ 293PACKAGE_TARNAME = @PACKAGE_TARNAME@
293PACKAGE_URL = @PACKAGE_URL@
294PACKAGE_VERSION = @PACKAGE_VERSION@ 294PACKAGE_VERSION = @PACKAGE_VERSION@
295PATH_SEPARATOR = @PATH_SEPARATOR@ 295PATH_SEPARATOR = @PATH_SEPARATOR@
296PCRE_CFLAGS = @PCRE_CFLAGS@ 296PCRE_CFLAGS = @PCRE_CFLAGS@
@@ -426,21 +426,18 @@ libscishell_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
426 426
427 427
428# Includes need for the compilation 428# Includes need for the compilation
429libscishell_la_CFLAGS = $(JAVA_JNI_INCLUDE) \ 429libscishell_la_CFLAGS = $(JAVA_JNI_INCLUDE) -Iincludes/ -Isrc/c/ \
430 -Iincludes/ \ 430 -I$(top_srcdir)/libs/MALLOC/includes/ \
431 -Isrc/c/ \ 431 -I$(top_srcdir)/modules/console/includes/ \
432 -I$(top_srcdir)/libs/MALLOC/includes/ \ 432 -I$(top_srcdir)/modules/history_manager/includes/ \
433 -I$(top_srcdir)/modules/console/includes/ \ 433 -I$(top_srcdir)/modules/output_stream/includes \
434 -I$(top_srcdir)/modules/history_manager/includes/ \ 434 -I$(top_srcdir)/modules/core/includes \
435 -I$(top_srcdir)/modules/output_stream/includes \ 435 -I$(top_srcdir)/modules/completion/includes \
436 -I$(top_srcdir)/modules/core/includes \ 436 -I$(top_srcdir)/modules/localization/includes \
437 -I$(top_srcdir)/modules/completion/includes \ 437 -I$(top_srcdir)/modules/action_binding/includes/ \
438 -I$(top_srcdir)/modules/localization/includes \ 438 -I$(top_srcdir)/modules/fileio/src/c/ \
439 -I$(top_srcdir)/modules/action_binding/includes/ \ 439 -I$(top_srcdir)/modules/api_scilab/includes \
440 -I$(top_srcdir)/modules/fileio/src/c/ \ 440 -I$(top_srcdir)/modules/fileio/includes/ $(am__append_2)
441 -I$(top_srcdir)/modules/api_scilab/includes \
442 -I$(top_srcdir)/modules/fileio/includes/
443
444 441
445# Name of the future library (.la will be replace by .so, .a, etc regarding 442# Name of the future library (.la will be replace by .so, .a, etc regarding
446# the system) 443# the system)
@@ -489,7 +486,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL
489#### the procedure will be the same with Microsoft Windows (C) 486#### the procedure will be the same with Microsoft Windows (C)
490#### and Linux/Unix 487#### and Linux/Unix
491####################################################################### 488#######################################################################
492TARGETS_ALL = $(am__append_2) 489TARGETS_ALL = $(am__append_3)
493 490
494################ MACROS ###################### 491################ MACROS ######################
495# Rule to build a macro 492# Rule to build a macro