[PD-cvs] externals/grill/py config-pd-linux.txt,1.5,1.6 makefile.pd-linux,1.4,1.5 py.vcproj,1.3,1.4

[xovo at users.sourceforge.net]

Update of /cvsroot/pure-data/externals/grill/py
In directory sc8-pr-cvs1:/tmp/cvs-serv345

Modified Files:
	config-pd-linux.txt makefile.pd-linux py.vcproj 
Log Message:
 ""

Index: config-pd-linux.txt
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/config-pd-linux.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** config-pd-linux.txt	4 Oct 2003 02:38:13 -0000	1.5
--- config-pd-linux.txt	17 Oct 2003 02:47:01 -0000	1.6
***************
*** 18,23 ****
  # where are the python header files?
  PYTHONINCLUDE=/usr/local/include/python${PYTHONVER}
! # where is the python library file?
! PYTHONLIB=/usr/local/lib/python${PYTHONVER}/config
  
  # where should flext libraries be built?
--- 18,24 ----
  # where are the python header files?
  PYTHONINCLUDE=/usr/local/include/python${PYTHONVER}
! # where is the python library file? 
! # in most cases this need only be specified for static linking
! # PYTHONLIB=/usr/local/lib/python${PYTHONVER}/config
  
  # where should flext libraries be built?
***************
*** 29,31 ****
  
  # define for shared build
! #FLEXT_SHARED=1
--- 30,32 ----
  
  # define for shared build
! FLEXT_SHARED=1

Index: makefile.pd-linux
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/makefile.pd-linux,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** makefile.pd-linux	4 Oct 2003 02:38:13 -0000	1.4
--- makefile.pd-linux	17 Oct 2003 02:47:01 -0000	1.5
***************
*** 18,30 ****
  INCLUDES=$(PDPATH) $(PYTHONINCLUDE)
  LIBPATH=$(PYTHONLIB)
! FLAGS=-DFLEXT_SYS=2 -DFLEXT_THREADS
! CFLAGS=-O2 $(UFLAGS)
  LIBS=util python$(PYTHONVER)  
  
  
  ifdef FLEXT_SHARED
! CFLAGS+=-shared -DFLEXT_SHARED
  LIBPATH+=$(FLEXTPATH)
  LIBFLEXT=-lflext
  
  ifeq ($(CXX),icc)
--- 18,41 ----
  INCLUDES=$(PDPATH) $(PYTHONINCLUDE)
  LIBPATH=$(PYTHONLIB)
! FLAGS=-DFLEXT_SYS=2
! CFLAGS=-pthread $(UFLAGS)
  LIBS=util python$(PYTHONVER)  
  
+ ifdef DEBUG
+ CFLAGS+=-g -DFLEXT_DEBUG
+ else
+ CFLAGS+=-O2
+ endif
  
  ifdef FLEXT_SHARED
! CFLAGS+=-shared
! FLAGS+=-DFLEXT_SHARED
  LIBPATH+=$(FLEXTPATH)
+ 
+ ifdef DEBUG
+ LIBFLEXT=-lflext_d
+ else
  LIBFLEXT=-lflext
+ endif
  
  ifeq ($(CXX),icc)
***************
*** 36,40 ****
--- 47,56 ----
  else
  
+ FLAGS+=-DFLEXT_THREADS
+ ifdef DEBUG
+ LIBFLEXT=$(FLEXTPATH)/libflext_td.a
+ else
  LIBFLEXT=$(FLEXTPATH)/libflext_t.a
+ endif
  
  endif
***************
*** 66,70 ****
--- 82,88 ----
  $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS))  
  	$(CXX) -shared $(LDFLAGS) -o $@ $^ $(patsubst %,-L%,$(LIBPATH)) $(LIBFLEXT) $(patsubst %,-l%,$(LIBS)) 
+ ifndef DEBUG	
  	strip --strip-unneeded $@ 
+ endif	
  	chmod 755 $@
  

Index: py.vcproj
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/py.vcproj,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** py.vcproj	2 Oct 2003 02:38:04 -0000	1.3
--- py.vcproj	17 Oct 2003 02:47:01 -0000	1.4
***************
*** 43,47 ****
  				LinkIncremental="1"
  				SuppressStartupBanner="TRUE"
! 				AdditionalLibraryDirectories="c:/programme/audio/pd/bin,..\flext\pd-msvc,f:\prog\packs\Python-2.2.1\PCbuild"
  				GenerateDebugInformation="TRUE"
  				ProgramDatabaseFile=".\pd-msvc\d/py.pdb"
--- 43,47 ----
  				LinkIncremental="1"
  				SuppressStartupBanner="TRUE"
! 				AdditionalLibraryDirectories="c:/programme/audio/pd/bin;"..\flext\pd-msvc""
  				GenerateDebugInformation="TRUE"
  				ProgramDatabaseFile=".\pd-msvc\d/py.pdb"
***************
*** 153,157 ****
  				Optimization="2"
  				InlineFunctionExpansion="1"
! 				AdditionalIncludeDirectories="c:\programme\audio\pd\src,f:\prog\max\flext\source,C:\Programme\prog\Python22\include"
  				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_THREADS"
  				StringPooling="TRUE"
--- 153,157 ----
  				Optimization="2"
  				InlineFunctionExpansion="1"
! 				AdditionalIncludeDirectories="c:\programme\audio\pd\src,f:\prog\max\flext\source,C:\Programme\prog\Python23\include"
  				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_THREADS"
  				StringPooling="TRUE"
***************
*** 171,175 ****
  				LinkIncremental="1"
  				SuppressStartupBanner="TRUE"
! 				AdditionalLibraryDirectories="c:/programme/audio/pd/bin,..\flext\pd-msvc,C:\Programme\prog\Python22\libs"
  				ProgramDatabaseFile=".\pd-msvc\tr/py.pdb"
  				ImportLibrary=".\pd-msvc\tr/py.lib"
--- 171,175 ----
  				LinkIncremental="1"
  				SuppressStartupBanner="TRUE"
! 				AdditionalLibraryDirectories="c:/programme/audio/pd/bin;"..\flext\pd-msvc";C:\Programme\prog\Python23\libs"
  				ProgramDatabaseFile=".\pd-msvc\tr/py.pdb"
  				ImportLibrary=".\pd-msvc\tr/py.lib"
***************
*** 229,233 ****
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="pd.lib"
  				OutputFile=".\pd-msvc\r/py.dll"
  				LinkIncremental="1"
--- 229,233 ----
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="pd.lib python23.lib"
  				OutputFile=".\pd-msvc\r/py.dll"
  				LinkIncremental="1"