* remove the .Append(LIBS = ['libverse']), since it confused the build system.
authorNathan Letwory <nathan@letworyinteractive.com>
Wed, 11 Oct 2006 07:28:37 +0000 (07:28 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Wed, 11 Oct 2006 07:28:37 +0000 (07:28 +0000)
* removed unused options BF_VERSE_LIBPATH, BF_VERSE, BF_VERSE_LIBS, since they are not used at all.
* some whitespace mods

There should be no more issues with "libverse.lib" not being found (or anything like
 that).

config/darwin-config.py
config/linux2-config.py
config/linuxcross-config.py
config/win32-mingw-config.py
config/win32-vc-config.py
extern/verse/dist/SConstruct
tools/btools.py

index 981e67f17f1b8e2a967dc900a2dd7f25f83877d7..7257485d8c73195264f9f22ccbf936e63c14befa 100644 (file)
@@ -2,10 +2,7 @@ LCGDIR = '#../lib/darwin-6.1-powerpc'
 LIBDIR = '${LCGDIR}'
 
 WITH_BF_VERSE = 'false'
-BF_VERSE = "#extern/verse/dist"
-BF_VERSE_LIBPATH = "${BF_BUILDDIR}/extern/verse/dist"
-BF_VERSE_INCLUDE = BF_VERSE
-BF_VERSE_LIBS = "libverse"
+BF_VERSE_INCLUDE = "#extern/verse/dist"
 
 BF_PYTHON = '/System/Library/Frameworks/Python.framework/Versions/'
 BF_PYTHON_VERSION = '2.3'
index 592c97466e4472bf6494fb43708af18602836e03..f77ffe47b22726eb5212cf5227141ecc0a45cede 100644 (file)
@@ -2,10 +2,7 @@ LCGDIR = '../lib/linux2'
 LIBDIR = "${LCGDIR}"
 
 WITH_BF_VERSE = 'false'
-BF_VERSE = "#extern/verse/dist"
-BF_VERSE_LIBPATH = "${BF_BUILDDIR}/extern/verse/dist"
-BF_VERSE_INCLUDE = BF_VERSE
-BF_VERSE_LIBS = "libverse"
+BF_VERSE_INCLUDE = "#extern/verse/dist"
 
 BF_PYTHON = '/usr'
 BF_PYTHON_VERSION = '2.4'
index ab1a0c9cb216b5e871ee423f71285b9db9bc8db2..fba10bbb089767c9127757569f8f0aa13fc18782 100644 (file)
@@ -2,10 +2,7 @@ LCGDIR = '../lib/windows'
 LIBDIR = '${LCGDIR}'
 
 WITH_BF_VERSE = 'false'
-BF_VERSE = "#extern/verse/dist"
-BF_VERSE_LIBPATH = "${BF_BUILDDIR}/extern/verse/dist"
-BF_VERSE_INCLUDE = BF_VERSE
-BF_VERSE_LIBS = "libverse"
+BF_VERSE_INCLUDE = "#extern/verse/dist"
 
 BF_PYTHON = LIBDIR + '/python'
 BF_PYTHON_VERSION = '2.4'
index ec3c39517886df64573ba48daeddb7ca82e266d8..6208c266b5b33bdf754dce6c937760169f57b6f3 100644 (file)
@@ -2,10 +2,7 @@ LCGDIR = '#../lib/windows'
 LIBDIR = "${LCGDIR}"
 
 WITH_BF_VERSE = 'false'
-BF_VERSE = "#extern/verse/dist"
-BF_VERSE_LIBPATH = "${BF_BUILDDIR}/extern/verse/dist"
-BF_VERSE_INCLUDE = BF_VERSE
-BF_VERSE_LIBS = "libverse"
+BF_VERSE_INCLUDE = "#extern/verse/dist"
 
 BF_PYTHON = LIBDIR + '/python'
 BF_PYTHON_VERSION = '2.4'
index 4493e91ec8a46ef5649a721e878a04905aa64761..b3edcab7e2b56f01d54572962c329c5e6aecd691 100644 (file)
@@ -2,10 +2,7 @@ LCGDIR = '#../lib/windows'
 LIBDIR = '${LCGDIR}'
 
 WITH_BF_VERSE = 'false'
-BF_VERSE = "#extern/verse/dist"
-BF_VERSE_LIBPATH = "${BF_BUILDDIR}/extern/verse/dist"
-BF_VERSE_INCLUDE = BF_VERSE
-BF_VERSE_LIBS = "libverse"
+BF_VERSE_INCLUDE = "#extern/verse/dist"
 
 BF_PYTHON = LIBDIR + '/python'
 BF_PYTHON_VERSION = '2.4'
index 7223263e42d4acdebde09a4d282cce02f9885b8f..d54f299c3f6d82ebb907dd237b02b599ee8891ba 100644 (file)
@@ -59,15 +59,15 @@ else:
 verse_env = env.Copy()
 
 cmd_gen_files = (['v_cmd_gen.c',
-                                 'v_cmd_def_a.c',
-                                 'v_cmd_def_b.c',
-                                 'v_cmd_def_c.c',
-                                 'v_cmd_def_g.c',
-                                 'v_cmd_def_m.c',
-                                 'v_cmd_def_o.c',
-                                 'v_cmd_def_s.c',
-                                 'v_cmd_def_t.c'
-                                 ])
+                  'v_cmd_def_a.c',
+                  'v_cmd_def_b.c',
+                  'v_cmd_def_c.c',
+                  'v_cmd_def_g.c',
+                  'v_cmd_def_m.c',
+                  'v_cmd_def_o.c',
+                  'v_cmd_def_s.c',
+                  'v_cmd_def_t.c'
+                  ])
 
 cmd_gen_deps = (['v_gen_pack_init.c'])
 
@@ -77,18 +77,18 @@ mkprot_tool = proto_env.Program(target = 'mkprot', source = cmd_gen_files)
 
 mkprot_re = re.compile('v_cmd_def_([a-z]{1}).c')
 def mkprot_emitter(target = None, source = None, env = None):
-       newtargets = list()
-       for s in source:
-               p, f = os.path.split(str(s))
-               m = mkprot_re.match(f)
-               if m:
-                       newtargets.append("v_gen_pack_"+m.group(1)+"_node.c")
-       newtargets.extend(['verse.h'])
-       env.Depends(newtargets, mkprot_tool)
-       return (newtargets, source)
+    newtargets = list()
+    for s in source:
+        p, f = os.path.split(str(s))
+        m = mkprot_re.match(f)
+        if m:
+            newtargets.append("v_gen_pack_"+m.group(1)+"_node.c")
+    newtargets.extend(['verse.h'])
+    env.Depends(newtargets, mkprot_tool)
+    return (newtargets, source)
 
 mkprot_bld = Builder(action = "\"" + mkprot_tool[0].abspath + "\" -src=\""+os.getcwd()+os.sep+"extern"+os.sep+"verse"+os.sep+"dist"+os.sep+os.sep+"\" -dst=\""+os.path.abspath(env['BF_BUILDDIR'])+os.sep+"extern"+os.sep+"verse"+os.sep+"dist"+os.sep+os.sep+"\"",
-                       emitter = mkprot_emitter)
+            emitter = mkprot_emitter)
 
 verse_env['BUILDERS']['Protocol'] = mkprot_bld
 
@@ -97,21 +97,21 @@ cmd_gen_deps.extend(verse_env.Protocol('do_mkprot', cmd_gen_files))
 cmd_gen_deps.pop()
 
 lib_source_files = (['v_cmd_buf.c',
-                                        'v_connect.c',
-                                        'v_connection.c',
-                                        'v_encryption.c',
-                                        'v_func_storage.c',
-                                        'v_man_pack_node.c',
-                                        'v_network.c',
-                                        'v_network_in_que.c',
-                                        'v_network_out_que.c',
-                                        'v_pack.c',
-                                        'v_pack_method.c',
-                                        'v_prime.c',
-                                        'v_randgen.c',
-                                        'v_util.c',
-                                        'v_bignum.c'
-                                        ])
+                     'v_connect.c',
+                     'v_connection.c',
+                     'v_encryption.c',
+                     'v_func_storage.c',
+                     'v_man_pack_node.c',
+                     'v_network.c',
+                     'v_network_in_que.c',
+                     'v_network_out_que.c',
+                     'v_pack.c',
+                     'v_pack_method.c',
+                     'v_prime.c',
+                     'v_randgen.c',
+                     'v_util.c',
+                     'v_bignum.c'
+                     ])
 lib_source_files.extend(cmd_gen_deps)
 
 server_source_files = (['vs_connection.c',
@@ -134,11 +134,9 @@ verselib_env.Append(CPPDEFINES = defines)
 
 verseserver_env = verse_env.Copy()
 verseserver_env.Append(CPPDEFINES = defines)
-verseserver_env.Append (LIBS=['libverse'])
 verseserver_env.Append (LIBPATH = ['.'])
 verseserver_env.Append (LIBS= platform_libs)
 
-#verselib =
 verselib_env.BlenderLib(libname='verse', sources=lib_source_files, includes=["."], defines = defines, libtype=['core', 'intern'], priority = [5, 5])
 verseserver_env.BlenderProg(builddir="#"+root_build_dir+os.sep, progname='verse', sources=server_source_files, libs=['verse'],
 libpath='#'+env['BF_BUILDDIR']+'/lib')
index cd860b093cabbee27cdd081c4f9bc8b137241fee..796d0b1955246c8b014c2bbb4b1d0be905d25e55 100755 (executable)
@@ -42,7 +42,7 @@ def validate_arguments(args, bc):
             'REL_CFLAGS', 'REL_CCFLAGS',
             'C_WARN', 'CC_WARN', 'LLIBS', 'PLATFORM_LINKFLAGS',
             'BF_PROFILE_FLAGS', 'LCGDIR', 'WITH_BF_VERSE', 
-            'BF_VERSE', 'BF_VERSE_LIBPATH', 'BF_VERSE_INCLUDE', 'BF_VERSE_LIB',
+            'BF_VERSE_INCLUDE',
             'VERSE_BUILD_BINARY', 'VERSE_BUILD_DIR', 'VERSE_REGEN_PROTO']
 
     arg_list = ['BF_DEBUG', 'BF_QUIET', 'BF_CROSS', 'BF_UPDATE',
@@ -116,10 +116,7 @@ def read_opts(cfg, args):
         ('VERSE_BUILD_DIR', 'Target directory for intermediate files.', "${BF_BUILDDIR}/extern/verse"),
         ('VERSE_REGEN_PROTO', 'Whether to regenerate the protocol files', 'yes'),
         (BoolOption('WITH_BF_VERSE', 'Use VERSE if true', 'false')),
-        ('BF_VERSE',  'verse dir', '/usr/lib'),
-        ('BF_VERSE_LIBPATH', 'verse lib dir',  '/usr/lib'),
         ('BF_VERSE_INCLUDE', 'verse include dir', '/usr/include'),
-        ('BF_VERSE_LIB', 'verse libs', ''),
         ('LCGDIR', 'location of cvs lib dir'),
         ('VERSE_BUILD_BINARY', 'Build a release or debug binary.', 'release'),
         ('VERSE_BUILD_DIR', 'Target directory for intermediate files.', "${BF_BUILDDIR}/extern/verse"),
@@ -132,7 +129,7 @@ def read_opts(cfg, args):
         ('BF_PYTHON_LIB', 'Python library', ''),
         ('BF_PYTHON_LIBPATH', 'Library path', ''),
         ('BF_PYTHON_LINKFLAGS', 'Python link flags', ''),
-                               ('BF_NO_ELBEEM', 'Disable Fluid Sim', 'false'),
+        ('BF_NO_ELBEEM', 'Disable Fluid Sim', 'false'),
         (BoolOption('WITH_BF_OPENAL', 'Use OpenAL if true', '')),
         ('BF_OPENAL', 'base path for OpenAL', ''),
         ('BF_OPENAL_INC', 'include path for python headers', ''),