diff options
author | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2011-05-28 07:18:40 +0400 |
---|---|---|
committer | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2011-05-28 07:18:40 +0400 |
commit | d35a381eb8a48570a0a1f16a1571a52b1dd4791a (patch) | |
tree | f8e90d06ecda0caef421c4fadb034c88ae174a2b | |
parent | 1c1a511f475695f60b207a45f007b9d8cf25123a (diff) |
Merge Cleanup.
Forth to make sure branch is a copy of trunk. This time the revision is 36950. Mostly svn property fixes. Biggest concern was missing 'svn:eol-style = native' tags, but also a lot of random 'svn:mergeinfo=' tages (yes, the merge info was empty). Probably need to remove these in trunk, but I added them back to clean up my diff.
-rw-r--r-- | source/SConscript | 11 | ||||
-rw-r--r-- | source/blender/editors/space_info/info_draw.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_info/info_report.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_info/textview.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_info/textview.h | 2 | ||||
-rw-r--r-- | source/blenderplayer/CMakeLists.txt | 17 |
6 files changed, 19 insertions, 17 deletions
diff --git a/source/SConscript b/source/SConscript index 3944a3c6df5..0002cb4cf0b 100644 --- a/source/SConscript +++ b/source/SConscript @@ -1,14 +1,13 @@ #!/usr/bin/python Import ('env') -SConscript(['blender/SConscript', - 'kernel/SConscript', - 'creator/SConscript']) +SConscript(['blender/SConscript', 'creator/SConscript']) + if env['WITH_BF_GAMEENGINE']: - SConscript (['gameengine/SConscript']) + SConscript (['gameengine/SConscript']) if env['WITH_BF_PLAYER']: - SConscript (['blenderplayer/bad_level_call_stubs/SConscript']) + SConscript (['blenderplayer/bad_level_call_stubs/SConscript']) if env['OURPLATFORM'] in ('win64-vc', 'win32-vc', 'win32-mingw', 'linuxcross'): - SConscript (['icons/SConscript']) + SConscript (['icons/SConscript']) diff --git a/source/blender/editors/space_info/info_draw.c b/source/blender/editors/space_info/info_draw.c index 50a23568bfd..3121ddaa3b4 100644 --- a/source/blender/editors/space_info/info_draw.c +++ b/source/blender/editors/space_info/info_draw.c @@ -1,5 +1,5 @@ /* - * $Id: info_draw.c 35242 2011-02-27 20:29:51Z jesterking $ + * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** * diff --git a/source/blender/editors/space_info/info_report.c b/source/blender/editors/space_info/info_report.c index 5a94e3bd148..937b683e880 100644 --- a/source/blender/editors/space_info/info_report.c +++ b/source/blender/editors/space_info/info_report.c @@ -1,5 +1,5 @@ /* - * $Id: info_report.c 36644 2011-05-12 16:47:36Z campbellbarton $ + * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** * diff --git a/source/blender/editors/space_info/textview.c b/source/blender/editors/space_info/textview.c index bf4e4cacc5f..afe8aa39c16 100644 --- a/source/blender/editors/space_info/textview.c +++ b/source/blender/editors/space_info/textview.c @@ -1,5 +1,5 @@ /* - * $Id: textview.c 35242 2011-02-27 20:29:51Z jesterking $ + * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** * diff --git a/source/blender/editors/space_info/textview.h b/source/blender/editors/space_info/textview.h index a249bbd7be5..a30c082575a 100644 --- a/source/blender/editors/space_info/textview.h +++ b/source/blender/editors/space_info/textview.h @@ -1,5 +1,5 @@ /* - * $Id: textview.h 35242 2011-02-27 20:29:51Z jesterking $ + * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** * diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index 34782ff9307..901aaea3eca 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -87,12 +87,13 @@ endif() ge_player_ghost ge_player_common bf_intern_string - bf_intern_ghost + bf_intern_ghost bf_rna bf_blenkernel bf_blenloader bf_blenpluginapi ge_blen_routines + bf_editor_datafiles ge_converter ge_logic_ketsji ge_phys_bullet @@ -103,10 +104,10 @@ endif() ge_oglrasterizer ge_logic_expressions ge_scenegraph - bf_ikplugin - bf_intern_itasc - bf_intern_ik - bf_intern_smoke + bf_ikplugin + bf_intern_itasc + bf_intern_ik + bf_intern_smoke bf_modifiers bf_intern_moto bf_nodes @@ -123,7 +124,7 @@ endif() bf_blenlib bf_imbuf_cineon bf_imbuf_openexr - extern_openjpeg + extern_openjpeg extern_redcode bf_imbuf_dds bf_dna @@ -133,9 +134,11 @@ endif() blenkernel_blc extern_binreloc extern_minilzo + bf_intern_ghost # duplicate for linking + bf_blenkernel # duplicate for linking bf_intern_mikktspace ) - + if(WITH_BUILTIN_GLEW) list(APPEND BLENDER_SORTED_LIBS extern_glew) endif() |