packages Makefile, 1.21, 1.22 Makefile.buildlayout, 1.15, 1.16 - Pd-cvs

20 Dec 2005


      Update of /cvsroot/pure-data/packages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3097
Modified Files:
    Makefile Makefile.buildlayout 
Log Message:
added in mingw_fixes patch which includes NT2_MSC_VER and lots of other stuff so that everything can compile using MinGW;  reorged things to use the full name 'windows' rather than just 'win'.  This matches 'darwin' and 'linux'; this is windows RC6
Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/packages/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Makefile	16 Dec 2005 18:38:11 -0000	1.21
--- Makefile	20 Dec 2005 00:13:16 -0000	1.22
***************
*** 142,146 ****
  # pd
! ifeq ($(OS_NAME),win)
    PD_CONFIGURE_FLAGS = 
  else
--- 142,146 ----
  # pd
! ifeq ($(OS_NAME),windows)
    PD_CONFIGURE_FLAGS = 
  else
***************
*** 375,379 ****
    		$(helpdir)
    	-install -p $(packages_src)/noncvs/$(OS_NAME)/extra/*.* $(objectsdir)
!
--- 375,381 ----
    		$(helpdir)
    	-install -p $(packages_src)/noncvs/$(OS_NAME)/extra/*.* $(objectsdir)
! 		-install -d $(DESTDIR)$(prefix)/gripd
! 		-install -p $(packages_src)/noncvs/$(OS_NAME)/gripd/*.* \
! 			 $(DESTDIR)$(prefix)/gripd
***************
*** 534,538 ****
! devsymlinks_win:
--- 536,540 ----
! devsymlinks_windows:
***************
*** 631,635 ****
    	sed 's/(pd_version[] = "Pd version )[0-9extndRC.-]*/\1$(PD_VERSION)-$(PACKAGE_VERSION)/'  s_main.c > s_main.c.tmp && \
    	mv s_main.c.tmp s_main.c
! 	for file in $(wildcard *.[ch]); do \
    	sed 's/MACOSX/__APPLE__/g' $${file} > $${file}.tmp && \
    		mv -f $${file}.tmp $$file;\
--- 633,637 ----
    	sed 's/(pd_version[] = "Pd version )[0-9extndRC.-]*/\1$(PD_VERSION)-$(PACKAGE_VERSION)/'  s_main.c > s_main.c.tmp && \
    	mv s_main.c.tmp s_main.c
! 	for file in $(wildcard $(pd_src)/src/*.[ch]); do \
    	sed 's/MACOSX/__APPLE__/g' $${file} > $${file}.tmp && \
    		mv -f $${file}.tmp $$file;\
***************
*** 640,644 ****
unpatch_pd:
! 	for file in $(wildcard *.[ch]); do \
    	sed 's/__APPLE__/MACOSX/g' $${file} > $${file}.tmp && \
    		mv -f $${file}.tmp $$file;\
--- 642,646 ----
unpatch_pd:
! 	for file in $(wildcard $(pd_src)/src/*.[ch]); do \
    	sed 's/__APPLE__/MACOSX/g' $${file} > $${file}.tmp && \
    		mv -f $${file}.tmp $$file;\
Index: Makefile.buildlayout
===================================================================
RCS file: /cvsroot/pure-data/packages/Makefile.buildlayout,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Makefile.buildlayout	18 Dec 2005 21:40:48 -0000	1.15
--- Makefile.buildlayout	20 Dec 2005 00:13:16 -0000	1.16
***************
*** 47,51 ****
    else
      ifeq (MINGW,$(findstring MINGW,$(UNAME)))
!       OS_NAME = win
        EXTENSION = dll
      else
--- 47,51 ----
    else
      ifeq (MINGW,$(findstring MINGW,$(UNAME)))
!       OS_NAME = windows
        EXTENSION = dll
      else
***************
*** 85,89 ****
    libpdbindir = $(bindir)
    else
!     ifeq ($(OS_NAME),win)
        libpddir = $(DESTDIR)$(prefix)
        libpdbindir = $(bindir)
--- 85,89 ----
    libpdbindir = $(bindir)
    else
!     ifeq ($(OS_NAME),windows)
        libpddir = $(DESTDIR)$(prefix)
        libpdbindir = $(bindir)