[PD-cvs] pd/src SConscript,1.1.4.30,1.1.4.31

[Thomas Grill]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13026/src

Modified Files:
      Tag: devel_0_39
	SConscript 
Log Message:
more changes... seems to compile ok under Windows now

Index: SConscript
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v
retrieving revision 1.1.4.30
retrieving revision 1.1.4.31
diff -C2 -d -r1.1.4.30 -r1.1.4.31
*** SConscript	5 Oct 2005 14:49:12 -0000	1.1.4.30
--- SConscript	7 Oct 2005 22:15:11 -0000	1.1.4.31
***************
*** 73,77 ****
  
  
! defs = []
  
  
--- 73,77 ----
  
  
! defs = ['PD']
  
  
***************
*** 95,113 ****
  # determine pthread and tcl/tk lib layout
  if pdenv['PLATFORM'] == 'win32':
! 	if pdenv['pthreadspath']:
  		path_pthread = pdenv['pthreadspath']
! 	else:
  		print "Please enter path to pthread library"
  		Exit(1)
  
! 	if pdenv['tclpath']:
  		path_tcl = pdenv['tclpath']
! 	else:
  		print "Please enter path to tcl"
  		Exit(1)
  
! 	if pdenv['asiopath']:
  		path_asio = pdenv['asiopath']
! 	else:
  		print "Please enter path to ASIO SDK"
  		Exit(1)
--- 95,122 ----
  # determine pthread and tcl/tk lib layout
  if pdenv['PLATFORM'] == 'win32':
! 	path_pthread = None
! 	try:
  		path_pthread = pdenv['pthreadspath']
! 	except:
! 		pass
! 	if not path_pthread:
  		print "Please enter path to pthread library"
  		Exit(1)
  
! 	path_tcl = None
! 	try:
  		path_tcl = pdenv['tclpath']
! 	except:
! 		pass
! 	if not path_tcl:
  		print "Please enter path to tcl"
  		Exit(1)
  
! 	path_asio = None
! 	try:
  		path_asio = pdenv['asiopath']
! 	except:
! 		pass
! 	if not path_asio:
  		print "Please enter path to ASIO SDK"
  		Exit(1)
***************
*** 116,120 ****
  	pdenv.Append(LIBPATH=[path_pthread,path_tcl+'/lib'])
  	
! 	pdenv.Append(CPPPATH=[path_asio+'/common',path_asio+'/host',path_asio+'/pc'])
  	pdenv.Append(LIBPATH=[path_asio])
  
--- 125,129 ----
  	pdenv.Append(LIBPATH=[path_pthread,path_tcl+'/lib'])
  	
! 	pdenv.Append(CPPPATH=[path_asio+'/common',path_asio+'/host',path_asio+'/host/pc'])
  	pdenv.Append(LIBPATH=[path_asio])
  
***************
*** 256,260 ****
  
  pdenv.Append(CPPPATH=".")
! pdenv.Append(LIBPATH=".")
  
  
--- 265,269 ----
  
  pdenv.Append(CPPPATH=".")
! #pdenv.Append(LIBPATH=".") # really?
  
  
***************
*** 280,285 ****
  if pdenv['PLATFORM'] == 'win32':
  
! 	pdenv.Append(CPPDEFINES=["MSW","NT"])
! 	pdenv.Append(LIBS=Split("ole32 winmm wsock32 advapi32"))
  
  	sources += Split("s_audio_mmio.c s_midi_mmio.c")
--- 289,299 ----
  if pdenv['PLATFORM'] == 'win32':
  
! 	pdenv.Append(CPPDEFINES=["MSW","NT","USEAPI_MMIO"])
! 	# this is needed for ASIO
! 	pdenv.Append(CPPDEFINES="WIN32")
! #	# these are additional ones from the original makefile - we shouldn't really need them, but need to make sure
! #	pdenv.Append(CPPDEFINES=["_CONSOLE","WINDOWS","__i386__","_WINDOWS"])
! 
! 	pdenv.Append(LIBS=Split("user32 ole32 winmm wsock32 advapi32"))
  
  	sources += Split("s_audio_mmio.c s_midi_mmio.c")
***************
*** 287,291 ****
  	if pdenv['asio']:
  		# enable native ASIO support
! 		sources += Split("s_audio_asio.cpp asio.cpp asiodrivers.cpp asiolist.cpp")
  		pdenv.Append(CPPDEFINES="USEAPI_ASIO")
  		pdenv.Append(LIBS="asiolib")
--- 301,306 ----
  	if pdenv['asio']:
  		# enable native ASIO support
! 		sources += ["s_audio_asio.cpp"]
! 		sources += [path_asio+"/common/asio.cpp",path_asio+"/host/asiodrivers.cpp",path_asio+"/host/pc/asiolist.cpp"]
  		pdenv.Append(CPPDEFINES="USEAPI_ASIO")
  		pdenv.Append(LIBS="asiolib")
***************
*** 398,402 ****
  lflags = ''
  
- #lflags += " /SUBSYSTEM:CONSOLE"
  
  if pdenv['wall']:
--- 413,416 ----
***************
*** 451,455 ****
  
  if pdenv['PLATFORM'] == 'win32':
! 	if not 'msvc' in pdenv['TOOLS']:
  		flags += " -mms-bitfields" ## binary compatibility with msvc
  
--- 465,471 ----
  
  if pdenv['PLATFORM'] == 'win32':
! 	if 'msvc' in pdenv['TOOLS']:
! 		cflags += " /EHsc" ## we need that for ASIO C++, won't hurt for pure C
! 	else:
  		flags += " -mms-bitfields" ## binary compatibility with msvc
  
***************
*** 518,522 ****
  								LINKFLAGS='-framework Tcl -framework Tk')
  if pdenv['PLATFORM']=='win32':
! 	pdgui = pdenv.SharedLibrary('../bin/pdtcl', Split("t_main.c t_tkcmd.c"))
  
  
--- 534,540 ----
  								LINKFLAGS='-framework Tcl -framework Tk')
  if pdenv['PLATFORM']=='win32':
! 	envtcl = pdenv.Copy()
! 	envtcl.Append(LINKFLAGS=["/EXPORT:Pdtcl_Init"])
! 	pdgui = envtcl.SharedLibrary('../bin/pdtcl', Split("t_main.c t_tkcmd.c"))