SF.net SVN: alleg: [7685] allegro/branches/4.3/scons/win32.scons

[<ka...@us...>]

Revision: 7685
          http://svn.sourceforge.net/alleg/?rev=7685&view=rev
Author:   kazzmir
Date:     2006-12-31 16:58:35 -0800 (Sun, 31 Dec 2006)

Log Message:
-----------
Can finally build asmdefs.inc and iblit8.o

Modified Paths:
--------------
    allegro/branches/4.3/scons/win32.scons

Modified: allegro/branches/4.3/scons/win32.scons
===================================================================
--- allegro/branches/4.3/scons/win32.scons	2007-01-01 00:41:39 UTC (rev 7684)
+++ allegro/branches/4.3/scons/win32.scons	2007-01-01 00:58:35 UTC (rev 7685)
@@ -23,6 +23,8 @@
 
 # assembler = Builder(action = 'gcc --x assembler-with-cpp $CCFLAGS $SOURCES -c -o $TARGET', src_suffic = '.s', suffic = '.o')
 
+# This shouldn't be needed. scons 0.96.93 can handle explicit assembly files
+# but it uses 'as' instead of gcc, so something needs to be changed here
 AssemblerAction = Action( 'gcc -x assembler-with-cpp $CCFLAGS $_CPPINCFLAGS $SOURCES -c -o $TARGET' )
 
 import SCons.Tool
@@ -115,14 +117,17 @@
 
 def asmdef(env,appendDir,buildDir,libDir):
     # prog = env.Program('asmdef',appendDir(buildDir + 'i386/', ['asmdef.c']))
+    env = env.Copy()
+    env.Replace(LIBS = [])
     prog = env.Program('asmdef.exe','#' + buildDir + '/i386/asmdef.c')
-    file = env.Command('#obj/mingw32/asmdef.inc','#src/i386/asmdef.c','asmdef.exe $TARGET')
-    # env.Depends(file,prog)
+    file = env.Command('obj/mingw32/asmdef.inc','#src/i386/asmdef.c','asmdef.exe $TARGET')
+    env.Depends(file,prog)
     # env.Depends('#obj/mingw32/asmdef.inc',prog)
-    env.Depends('#' + buildDir + '/i386/iblit8.o',prog)
+    # env.Depends('#' + buildDir + '/i386/iblit8.o',prog)
+    env.Depends('#' + buildDir + '/i386/iblit8.o',file)
     # file = env.Cat('#obj/mingw32/asmdef.inc', 'x')
-    dep = env.Depends('#' + buildDir + '/i386/iblit8.o',file)
-    return dep
+    # dep = env.Depends('#' + buildDir + '/i386/iblit8.o',file)
+    return file
 
 context.addExtra(asmdef)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.