diff options
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/freestyle/SConscript | 13 | ||||
-rw-r--r-- | source/blender/freestyle/intern/app_blender/AppGLWidget_point.h | 2 | ||||
-rw-r--r-- | source/blender/freestyle/intern/app_blender/test_config.h | 3 |
3 files changed, 12 insertions, 6 deletions
diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript index 33bc9682bbe..c9a77919f4f 100644 --- a/source/blender/freestyle/SConscript +++ b/source/blender/freestyle/SConscript @@ -74,11 +74,18 @@ env.BlenderLib (libname="bf_freestyle", ######################################################## # 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 + diff --git a/source/blender/freestyle/intern/app_blender/AppGLWidget_point.h b/source/blender/freestyle/intern/app_blender/AppGLWidget_point.h index 81903f174a8..4250922239d 100644 --- a/source/blender/freestyle/intern/app_blender/AppGLWidget_point.h +++ b/source/blender/freestyle/intern/app_blender/AppGLWidget_point.h @@ -156,4 +156,4 @@ inline const Point operator/( const Point &p, double c ) return Point((QCOORD)(p.xp/c), (QCOORD)(p.yp/c)); } -#endif // POINT_H
\ No newline at end of file +#endif // POINT_H diff --git a/source/blender/freestyle/intern/app_blender/test_config.h b/source/blender/freestyle/intern/app_blender/test_config.h index 98239f279f3..6507050a4e4 100644 --- a/source/blender/freestyle/intern/app_blender/test_config.h +++ b/source/blender/freestyle/intern/app_blender/test_config.h @@ -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" |