[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15042] branches/soc-2008-mxcurioni/source /blender/freestyle: soc-2008-mxcurioni: updated SConscript file for SWIG module compilation and linking under Linux

Maxime Curioni maxime.curioni at gmail.com
Thu May 29 04:31:38 CEST 2008


Revision: 15042
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15042
Author:   mxcurioni
Date:     2008-05-29 04:31:36 +0200 (Thu, 29 May 2008)

Log Message:
-----------
soc-2008-mxcurioni: updated SConscript file for SWIG module compilation and linking under Linux

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/AppGLWidget_point.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/test_config.h

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript	2008-05-29 02:25:55 UTC (rev 15041)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript	2008-05-29 02:31:36 UTC (rev 15042)
@@ -74,11 +74,18 @@
 ########################################################
 #	swig
 #
-# 	Run the following two commands in the source/blender/freestyle/intern/swig directory.
+# 	1] Run the following two commands in the source/blender/freestyle/intern/swig directory.
 #
-#	Replace /Users/mx/Documents/work/GSoC_2008/bf-blender/branches/build/darwin/lib to the path
+#	2] Replace /Users/mx/Documents/work/GSoC_2008/bf-blender/branches/build/darwin/lib to the path
 #	of your library directory (used to locate libbf_freestyle.a)
+#
+#   3] Replace the python directories to suit your config
 
 # g++ -w  -I../geometry -I../image -I../scene_graph -I../stroke -I../system -I../view_map -I../winged_edge -I/usr/include/python2.5 -I../../../blenlib -I../../../blenkernel -I../../../imbuf -I../../../makesdna -c ModuleWrapper.cpp -o ModuleWrapper.o
 
-# g++ -bundle -flat_namespace -undefined suppress  -w  -L/usr/lib/python2.5/config -L/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/build/darwin/lib -lpython2.5 -lbf_freestyle -o ../../python/_Freestyle.so ModuleWrapper.o
\ No newline at end of file
+###########  Mac OS X ###########
+# g++ -bundle -flat_namespace -undefined suppress  -w  -L/usr/lib/python2.5/config -L/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/build/darwin/lib -lpython2.5 -lbf_freestyle -o ../../python/_Freestyle.so ModuleWrapper.o
+
+###########  Linux  ###########
+# g++ -shared -w  -L/usr/lib/python2.5/config -L/home/joe/bf_blender_freestyle/build/linux2/lib  -lpython2.5 -lbf_freestyle -o ../../python/_Freestyle.so ModuleWrapper.o
+

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/AppGLWidget_point.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/AppGLWidget_point.h	2008-05-29 02:25:55 UTC (rev 15041)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/AppGLWidget_point.h	2008-05-29 02:31:36 UTC (rev 15042)
@@ -156,4 +156,4 @@
     return Point((QCOORD)(p.xp/c), (QCOORD)(p.yp/c));
 }
 
-#endif // POINT_H
\ No newline at end of file
+#endif // POINT_H

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/test_config.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/test_config.h	2008-05-29 02:25:55 UTC (rev 15041)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/test_config.h	2008-05-29 02:31:36 UTC (rev 15042)
@@ -5,5 +5,4 @@
 
 #define TEST_ROOT_DIR "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle"
 
-
-#define TEST_TEXTURE_FILE "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle/data/textures/papers/whitepaper.jpg"
\ No newline at end of file
+#define TEST_TEXTURE_FILE "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle/data/textures/papers/whitepaper.jpg"





More information about the Bf-blender-cvs mailing list