[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29317] branches/soc-2010-rohith291991/ intern: Made some changes and added Sconscript files.
Rohith B V
rohith291991 at gmail.com
Mon Jun 7 20:57:04 CEST 2010
Revision: 29317
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29317
Author: rohith291991
Date: 2010-06-07 20:57:04 +0200 (Mon, 07 Jun 2010)
Log Message:
-----------
Made some changes and added Sconscript files. Hopefully Compiles ok.
Modified Paths:
--------------
branches/soc-2010-rohith291991/intern/SConscript
Added Paths:
-----------
branches/soc-2010-rohith291991/intern/comiso/Makefile
branches/soc-2010-rohith291991/intern/comiso/SConscript
branches/soc-2010-rohith291991/intern/comiso/extern/
branches/soc-2010-rohith291991/intern/comiso/extern/comiso.h
branches/soc-2010-rohith291991/intern/comiso/make/
Removed Paths:
-------------
branches/soc-2010-rohith291991/intern/comiso/CHANGELOG
branches/soc-2010-rohith291991/intern/comiso/Config/
branches/soc-2010-rohith291991/intern/comiso/Examples/
branches/soc-2010-rohith291991/intern/comiso/QtWidgets/
branches/soc-2010-rohith291991/intern/comiso/README.txt
branches/soc-2010-rohith291991/intern/comiso/Solver/
branches/soc-2010-rohith291991/intern/comiso/Utils/
Modified: branches/soc-2010-rohith291991/intern/SConscript
===================================================================
--- branches/soc-2010-rohith291991/intern/SConscript 2010-06-07 18:50:19 UTC (rev 29316)
+++ branches/soc-2010-rohith291991/intern/SConscript 2010-06-07 18:57:04 UTC (rev 29317)
@@ -13,7 +13,8 @@
'itasc/SConscript',
'boolop/SConscript',
'opennl/SConscript',
- 'smoke/SConscript'])
+ 'smoke/SConscript',
+ 'comiso/SConscript'])
# NEW_CSG was intended for intern/csg, but
# getting it to compile is difficult
Deleted: branches/soc-2010-rohith291991/intern/comiso/CHANGELOG
===================================================================
--- branches/soc-2010-rohith291991/intern/comiso/CHANGELOG 2010-06-07 18:50:19 UTC (rev 29316)
+++ branches/soc-2010-rohith291991/intern/comiso/CHANGELOG 2010-06-07 18:57:04 UTC (rev 29317)
@@ -1,4 +0,0 @@
-#============================================================================================
-
-CoMISo 1.0-rc1:
-- Initial release
Added: branches/soc-2010-rohith291991/intern/comiso/Makefile
===================================================================
--- branches/soc-2010-rohith291991/intern/comiso/Makefile (rev 0)
+++ branches/soc-2010-rohith291991/intern/comiso/Makefile 2010-06-07 18:57:04 UTC (rev 29317)
@@ -0,0 +1,54 @@
+# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
+# vim: tabstop=8
+#
+# $Id: Makefile 19330 2009-03-19 01:50:45Z hos $
+#
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Hans Lambermont, GSR
+#
+# ***** END GPL LICENSE BLOCK *****
+# elbeem main makefile.
+#
+
+include nan_definitions.mk
+
+unexport NAN_QUIET
+
+LIBNAME = elbeem
+SOURCEDIR = intern/$(LIBNAME)
+DIR = $(OCGDIR)/$(SOURCEDIR)
+DIRS = intern
+#not ready yet TESTDIRS = test
+
+include nan_subdirs.mk
+
+install: $(ALL_OR_DEBUG)
+ @[ -d $(NAN_ELBEEM) ] || mkdir $(NAN_ELBEEM)
+ @[ -d $(NAN_ELBEEM)/include ] || mkdir $(NAN_ELBEEM)/include
+ @[ -d $(NAN_ELBEEM)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_ELBEEM)/lib/$(DEBUG_DIR)
+ @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libelbeem.a $(NAN_ELBEEM)/lib/$(DEBUG_DIR)
+ifeq ($(OS),darwin)
+ ranlib $(NAN_ELBEEM)/lib/$(DEBUG_DIR)libelbeem.a
+endif
+ @../tools/cpifdiff.sh extern/*.h $(NAN_ELBEEM)/include/
+
Deleted: branches/soc-2010-rohith291991/intern/comiso/README.txt
===================================================================
--- branches/soc-2010-rohith291991/intern/comiso/README.txt 2010-06-07 18:50:19 UTC (rev 29316)
+++ branches/soc-2010-rohith291991/intern/comiso/README.txt 2010-06-07 18:57:04 UTC (rev 29317)
@@ -1,59 +0,0 @@
-CoMISo Version 1.0 rc1
-www.rwth-graphics.de
-zimmer at informatik.rwth-aachen.de
-bommes at informatik.rwth-aachen.de
-
-What is
--------
-This is a short readme file to get you started with the Constrained Mixed-Integer Solver (CoMISo). It shortly overviews the system prerequisites and explains how to build the package. See the examples and the HarmonicExample OpenFlipper plugin for usage examples and ideas.
-
-Requirements
-------------
-Here is an example of what packages were needed to compile CoMISo on a freshly installed Ubuntu 9.04 system
-# sudo apt-get install g++
-# sudo apt-get install cmake
-# sudo apt-get install libgmm-dev
-# sudo apt-get install libboost-dev
-# sudo apt-get install libblas-dev
-# sudo apt-get install libsuitesparse-dev
-(some other needed libraries such as lapack, are installed as dependencies of the above)
-
-For Windows and Macintosh systems the corresponding packages need to be downloaded and installed.
-
-The cmake build system should enable building the CoMISo library under Windows and Macintosh systems, please let me know if this is (not) the case!
-
-OpenFlipper requirements:
--------------------------
-To build OpenFlipper you additionally need to install all the Qt4 packages libqt4-{dev-dbg, dev, network, gui, opengl, opengl-dev, script, scripttools, ...} and also
-# sudo apt-get install libglew1.5-dev
-# sudo apt-get install glutg3-dev
-
-Building (Stand alone)
-----------------------
-Assuming CoMISo was unpacked to the directory SOME_DIRECTORY/CoMISo (where SOME_DIRECTORY should be /PATH_TO_OPENFLIPPER/libs/CoMISo for integration with the OpenFlipper framework) the package is built by creating a build directory, using cmake to create the Makefiles and using make to actually build:
-
-# cd /SOME_DIRECTORY/CoMISo/
-# mkdir build
-# cd build
-# cmake ..
-(assuming all needed packages are installed and cmake threw no errors...)
-# make
-
-The binaries (examples) and the shared library are found under
-/SOME_DIRECTORY/CoMISO/build/Build/bin/
-and
-/SOME_DIRECTORY/CoMISO/build/Build/lib/CoMISo/
-
-
-Building (For use with OpenFlipper)
------------------------------------
-Simply extract/checkout the CoMISo directory to the /PATH_TO_OPENFLIPPER/libs/ directory. The library will be automatically built and you will find the shared library libCoMISo.so under the OpenFlipper build directory.
-To use the solver in your Plugin add CoMISo to the CMakeLists.txt of the plugin and you are set, see Plugin-HarmonicExample for an example.
-
-Using
------
-To use the solver library in your applications have a look at the /SOME_DIRECTORY/CoMISo/Examples/ and the sample OpenFlipper plugin (Plugin-HarmonicExample) downloadable from the CoMISo project homepage.
-
-Feedback
---------
-We appreciate your feedback! Bugs, comments, questions or patches send them to zimmer at informatik.rwth-aachen.de or bommes at informatik.rwth-aachen.de !
Added: branches/soc-2010-rohith291991/intern/comiso/SConscript
===================================================================
--- branches/soc-2010-rohith291991/intern/comiso/SConscript (rev 0)
+++ branches/soc-2010-rohith291991/intern/comiso/SConscript 2010-06-07 18:57:04 UTC (rev 29317)
@@ -0,0 +1,13 @@
+#!/usr/bin/python
+import sys
+import os
+Import('env')
+
+sources = env.Glob('intern/*.cpp')
+
+incs = ''
+incs+=" ../../extern/Eigen2/Eigen"
+
+defs=''
+
+env.BlenderLib ('bf_comiso', sources, Split(incs), Split(defs), libtype='intern', priority=0 )
Added: branches/soc-2010-rohith291991/intern/comiso/extern/comiso.h
===================================================================
--- branches/soc-2010-rohith291991/intern/comiso/extern/comiso.h (rev 0)
+++ branches/soc-2010-rohith291991/intern/comiso/extern/comiso.h 2010-06-07 18:57:04 UTC (rev 29317)
@@ -0,0 +1,19 @@
+#ifndef COMISO_API_H
+#define COMISO_API_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//void random_sparse_row_matrix( SparseXdr& _B, int _m, int _n, double _density );
+//void extract_Axb( const SparseXdr& _B, MatrixXd& _A, std::vector<double>& _b);
+//void simple_constraint_row_matrix( MatrixXd& _C, int _c, int _n, double _distribution );
+//template <class MatrixT >
+//void print_equations( const MatrixT& _B);
+
+
+#ifdef __cplusplus
+ }
+#endif
+
+#endif
More information about the Bf-blender-cvs
mailing list