Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2007-12-20 19:33:45 +0300
committerCampbell Barton <ideasman42@gmail.com>2007-12-20 19:33:45 +0300
commit2e48a4af57759e61a1afd89edb19a4dc92ced728 (patch)
tree1c3f77e17a8c511baaaa216aea80e14e58b20fb9 /source/nan_compile.mk
parent846e4027ce65f62654afcf23ed18365d8e501c1e (diff)
change default solaris gcc args, use -m64 for 64bit arch, use -O2 rather then -O1
Diffstat (limited to 'source/nan_compile.mk')
-rw-r--r--source/nan_compile.mk29
1 files changed, 18 insertions, 11 deletions
diff --git a/source/nan_compile.mk b/source/nan_compile.mk
index d5bf04c4b33..c723ff4bfc6 100644
--- a/source/nan_compile.mk
+++ b/source/nan_compile.mk
@@ -181,18 +181,25 @@ ifeq ($(OS),solaris)
CCFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing
# CFLAGS += "-fast -xdepend -xarch=v8plus -xO3 -xlibmil -KPIC -DPIC -xchar=unsigned"
# CCFLAGS += "-fast -xdepend -xarch=v8plus -xO3 -xlibmil -xlibmopt -features=tmplife -norunpath -KPIC -DPIC -xchar=unsigned"
- REL_CFLAGS += -O1
- REL_CCFLAGS += -O1
+
+ ifeq ($(findstring 64,$(CPU)), 64)
+ CFLAGS += -m64
+ CCFLAGS += -m64
+ endif
+
+ REL_CFLAGS += -O2
+ REL_CCFLAGS += -O2
+
NAN_DEPEND = true
- #ifeq ($(CPU),sparc)
- ifeq ($(CPU),$(findstring $(CPU), "sparc"))
- OPENGL_HEADERS = /usr/openwin/share/include
- CPPFLAGS += -DSUN_OGL_NO_VERTEX_MACROS
- JAVA_HEADERS = /usr/java/include
- JAVA_SYSTEM_HEADERS = /usr/java/include/solaris
- else
- OPENGL_HEADERS = $(LCGDIR)/mesa/include
- endif
+# ifeq ($(CPU),sparc)
+ ifeq ($(findstring sparc,$(CPU)), sparc)
+ OPENGL_HEADERS = /usr/openwin/share/include
+ CPPFLAGS += -DSUN_OGL_NO_VERTEX_MACROS
+ JAVA_HEADERS = /usr/java/include
+ JAVA_SYSTEM_HEADERS = /usr/java/include/solaris
+ else
+ OPENGL_HEADERS = $(LCGDIR)/mesa/include
+ endif
AR = ar
ARFLAGS = ruv
ARFLAGSQUIET = ru