cygwin buildscripts changed again to be more stable.

added a couple more endlines to eof

SConstruct

@@ -1,5 +1,21 @@
-#fetch environment
-env = Environment()
+# XXX path separator fixed right now
+opts = Options()
+opts.Add('PSS_STYLE', 'Path separator style', 1)
+opts.Add('LSB_FIRST', 'Least significant byte first?', 1)
+
+#Import('env')
+env = Environment(options = opts,
+                  CPPDEFINES={'PSS_STYLE' : '${PSS_STYLE}',
+                              'LSB_FIRST' : '${LSB_FIRST}'})
+
+print "platform: ", env['PLATFORM']
+
+#special flags for cygwin
+#we have to do this here so that the function and lib checks will go through mingw
+if env['PLATFORM'] == 'cygwin':
+  env['CCFLAGS'] += "-mno-cygwin";
+  env['LINKFLAGS'] += "-mno-cygwin";
+  env['LIBS'] = ['ddraw','dinput','dsound','gdi32','dxguid','winmm','shell32','wsock32','comdlg32','ole32'];
 
 conf = Configure(env)
 if not conf.CheckLib('SDL'):
@@ -8,8 +24,9 @@ if not conf.CheckLib('SDL'):
 if not conf.CheckLib('z'):
   print 'Did not find libz.a or z.lib, exiting!'
   Exit(1)
-if not conf.CheckFunc('asprintf'):
-  env['CCFLAGS'] += " -DHAVE_ASPRINTF"
+if conf.CheckFunc('asprintf'):
+  conf.env['CCFLAGS'].append("-DHAVE_ASPRINTF");
+
 
 env = conf.Finish()
 Export('env')

src/SConscript

@@ -41,15 +41,8 @@ drivers/pc/SConscript
 #palettes/SConscript
 Import('file_list')
 
-# XXX path separator fixed right now
-opts = Options()
-opts.Add('PSS_STYLE', 'Path separator style', 1)
-opts.Add('LSB_FIRST', 'Least significant byte first?', 1)
-
-env = Environment(options = opts,
-                  CPPDEFINES={'PSS_STYLE' : '${PSS_STYLE}',
-                              'LSB_FIRST' : '${LSB_FIRST}'})
-
+Import('env')
+                              
 # use sdl-config to get the cflags and libpath
 import os;
 sdl_cflags_pipe = os.popen("sdl-config --cflags");
@@ -68,23 +61,18 @@ for flag in sdl_libflags.split(' '):
     elif flag.find("-l") == 0:
         sdl_libs.append(flag.strip("-l"));
     else:
-        env['LINKFLAGS'] += " " + flag;
+        print "extra link flag: ", flag;
+        env['LINKFLAGS'] += flag;
+        
 sdl_libflags_pipe.close();
 
 # add zlib
-libs = sdl_libs;
-libs.append('z');
+env['LIBS'].append('z');
+env['LIBS'].extend(sdl_libs);
 
 # include sdl cflags
 env['CCFLAGS'] += sdl_cflags;
 
-#special flags for cygwin
-print "platform: " + env['PLATFORM']
-if env['PLATFORM'] == 'cygwin':
-  env['CCFLAGS'] += " -mno-cygwin"
-  #env['LINKFLAGS'] += " -mno-cygwin"
-  libs.extend(['ddraw','dinput','dsound','gdi32','dxguid','winmm','shell32','wsock32','comdlg32','ole32']);
- 
-print env['CCFLAGS']
+print env['LINKFLAGS']
 
-env.Program('fceu', file_list, LIBS=libs, LIBPATH=sdl_libpath)
+env.Program('fceu', file_list, LIBPATH=sdl_libpath)

src/config.cpp

@@ -31,4 +31,4 @@ FCEUX\n\
 	strcpy(aboutString,aboutTemplate);
 	strcat(aboutString,compilerString);
 	return aboutString;
-}
+}

src/mappers/43.cpp

@@ -74,4 +74,4 @@ void Mapper43_init(void)
  SetReadHandler(0x6000,0xffff,CartBR);
  MapIRQHook=M43Ho;
 }
-*/
+*/

src/mappers/__226.cpp

@@ -73,4 +73,4 @@ void Mapper226_init(void)
   GameStateRestore=M26Restore;
   M26Reset();
 }
-*/
+*/