aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--externals/Makefile28
-rw-r--r--packages/Makefile.buildlayout4
-rw-r--r--packages/darwin_app/Makefile105
-rw-r--r--packages/patches/complete_version_defines-0.39.2.patch36
4 files changed, 45 insertions, 128 deletions
diff --git a/externals/Makefile b/externals/Makefile
index 6c6c938d..156ead8c 100644
--- a/externals/Makefile
+++ b/externals/Makefile
@@ -13,6 +13,9 @@ cvs_root_dir = $(CWD)/..
DESTDIR = $(CWD)/build/
BUILDLAYOUT_DIR = $(cvs_root_dir)/packages
+# turn on weak linking and dlopen support
+export MACOSX_DEPLOYMENT_TARGET = 10.3
+
# default target
default: all
@@ -116,7 +119,6 @@ ifeq ($(OS_NAME),windows)
else
ifeq ($(OS_NAME),darwin)
LIB_TARGETS += hid
-# LIB_TARGETS += hid pdp
else
# GNU/Linux, BSD, IRIX, etc.
LIB_TARGETS += hid pdp pidip
@@ -551,8 +553,10 @@ ifeq ($(OS_NAME),windows)
else
ifeq ($(OS_NAME),darwin)
FRAMEWORKS = Carbon IOKit ForceFeedback
- HID_CFLAGS = $(CFLAGS) -I$(externals_src)/hcs/hid/HID\ Utilities\ Source
- HID_LIBS = $(LIBS) -L$(externals_src)/hcs/hid/HID\ Utilities\ Source/build \
+ HID_CFLAGS = $(CFLAGS) -I$(externals_src)/hcs/hid/HID\ Utilities\ Source
+ HID_UTILITIES_SOURCE = $(externals_src)/hcs/hid/HID\ Utilities\ Source
+ HID_LIBS = $(LIBS) -L$(HID_UTILITIES_SOURCE)/build \
+ -L$(HID_UTILITIES_SOURCE)/build/Default \
-lHIDUtilities $(patsubst %,-weak_framework %,$(FRAMEWORKS))
else
HID_CFLAGS = $(CFLAGS)
@@ -565,7 +569,14 @@ HID_OBJECTS := $(patsubst %.c, $(externals_src)/hcs/hid/%.o, $(HID_SRC))
$(HID_OBJECTS) : %.o : %.c
$(CC) $(HID_CFLAGS) -o "$*.o" -c "$*.c"
-$(externals_src)/hcs/hid/hid.$(EXTENSION): $(HID_OBJECTS)
+$(HID_UTILITIES_SOURCE)/build/libHIDUtilities.a:
+# Apple changed the XCode CLI tool's name in xcode2... arg
+ cd $(HID_UTILITIES_SOURCE) && \
+ (test -x /usr/bin/xcodebuild && /usr/bin/xcodebuild) || pbxbuild
+
+
+$(externals_src)/hcs/hid/hid.$(EXTENSION): $(HID_OBJECTS) \
+$(HID_UTILITIES_SOURCE)/build/libHIDUtilities.a
$(CC) $(LDFLAGS) -o $(externals_src)/hcs/hid/hid.$(EXTENSION) \
$(HID_OBJECTS) $(HID_LIBS)
$(STRIP) $(externals_src)/hcs/hid/hid.$(EXTENSION)
@@ -723,8 +734,9 @@ mapping_install: mapping
--description "objects for mapping data to control" \
--license "GNU GPL" \
--version ""
- install -p $(MAPPING_OBJECTS:.c=.$(EXTENSION)) $(objectsdir)/$(MAPPING_NAME)
- install -p $(externals_src)/mapping/*.pd $(objectsdir)/$(MAPPING_NAME)
+# no compiled objects yet...
+# install -p $(MAPPING_OBJECTS:.c=.$(EXTENSION)) $(objectsdir)/$(MAPPING_NAME)
+ install -p $(externals_src)/mapping/pd/*.pd $(objectsdir)/$(MAPPING_NAME)
install -d $(helpdir)/$(MAPPING_NAME)
install -p $(externals_src)/mapping/help/*.pd \
$(helpdir)/$(MAPPING_NAME)
@@ -732,8 +744,8 @@ mapping_install: mapping
install -p $(externals_src)/mapping/README.txt \
$(manualsdir)/$(MAPPING_NAME)/README.txt
install -d $(examplesdir)/$(MAPPING_NAME)
- install -p $(externals_src)/mapping/examples/*.pd \
- $(examplesdir)/$(MAPPING_NAME)
+# install -p $(externals_src)/mapping/examples/*.pd \
+# $(examplesdir)/$(MAPPING_NAME)
mapping_clean:
-rm -f -- $(externals_src)/mapping/*.$(EXTENSION)
diff --git a/packages/Makefile.buildlayout b/packages/Makefile.buildlayout
index 2971545c..78cd50f9 100644
--- a/packages/Makefile.buildlayout
+++ b/packages/Makefile.buildlayout
@@ -154,8 +154,8 @@ ifneq ($(PD_TEST_VERSION),)
endif
# release version for this distro
-PACKAGE_VERSION = extended-test1
-PACKAGE_NAME = Pd-$(PD_VERSION)-$(PACKAGE_VERSION)
+PACKAGE_VERSION = extended-test2
+PACKAGE_NAME = Pd-$(PD_VERSION)
diff --git a/packages/darwin_app/Makefile b/packages/darwin_app/Makefile
index 45e0d5e7..cb58c052 100644
--- a/packages/darwin_app/Makefile
+++ b/packages/darwin_app/Makefile
@@ -4,9 +4,6 @@ current: darwin_app
# turn on weak linking and dlopen support
export MACOSX_DEPLOYMENT_TARGET = 10.3
-# needed to support weak linking of frameworks
-#MAKE = MACOSX_DEPLOYMENT_TARGET=10.3 make
-
CWD := $(shell pwd)
BUILD_BASE = $(CWD)/build
PD_APP_NAME = $(PACKAGE_NAME)
@@ -224,11 +221,11 @@ darwin_app_clean:
$(UNIX_PACKAGE_NAME).pkg "$(DMG_NAME).dmg"
-
-
-
-
-
+#==============================================================================#
+#
+## TEST TARGETS
+#
+#==============================================================================#
test_locations:
@echo "PD_VERSION: $(PD_VERSION)"
@@ -249,95 +246,3 @@ test_locations:
@echo "MANUALSDIR $(manualsdir)"
@echo "EXAMPLESDIR $(examplesdir)"
-
-
-#==============================================================================#
-#
-## DEPRECATED TARGETS
-#
-#==============================================================================#
-
-darwin_app_externals_flext_clean:
- @echo " "
- @echo "Deprecated!!"
- @echo "cd $(packages_src) && $(MAKE) flext_clean"
-
-
-darwin_app_externals_flext:
- @echo " "
- @echo "Deprecated!!"
- @echo "cd $(packages_src) && $(MAKE) flext_install"
- cd $(packages_src) && $(MAKE) $(DEST_PATHS) flext_install
-
-
-darwin_app_noncvs:
- @echo " "
- @echo "Deprecated!!"
- @echo "cd $(packages_src) && $(MAKE) noncvs_install"
- cd $(packages_src) && $(MAKE) $(DEST_PATHS) noncvs_install
-
-darwin_app_externals_gem_clean:
- @echo " "
- @echo "Deprecated!!"
- @echo "cd $(packages_src) && $(MAKE) gem_clean"
-
-darwin_app_externals_gem:
- @echo " "
- @echo "Deprecated!!"
- @echo "cd $(packages_src) && $(MAKE) gem_install"
-
-darwin_app_externals_standard_clean:
- @echo " "
- @echo "Deprecated!!"
- @echo "cd $(packages_src) && $(MAKE) externals_clean"
-
-darwin_pd_clean:
- @echo " "
- @echo "Deprecated!!"
- @echo "cd $(packages_src) && $(MAKE) pd_clean"
-
-darwin_app_externals:
- @echo " "
- @echo "Deprecated!!"
- @echo "cd $(externals_src) && $(MAKE) install"
-
-darwin_app_externals_standard:
- @echo " "
- @echo "Deprecated!!"
- @echo "cd $(externals_src) && $(MAKE) install"
-
-darwin_patch_pd:
- @echo " "
- @echo "Deprecated!!"
- @echo "cd .. && $(MAKE) patch_pd"
-
-darwin_unpatch_pd:
- @echo " "
- @echo "Deprecated!!"
- @echo "cd .. && $(MAKE) unpatch_pd"
-
-darwin_app_docs:
- @echo " "
- @echo "Deprecated!!"
- @echo "cd $(doc_src) && $(MAKE) install"
-
-darwin_app_license:
- @echo " "
- @echo "Deprecated!!"
- @echo "cd .. && $(MAKE) license"
-
-darwin_app_welcome:
- @echo " "
- @echo "Deprecated!!"
- @echo "cd .. && $(MAKE) welcome"
-
-darwin_app_readme:
- @echo " "
- @echo "Deprecated!!"
- @echo "cd .. && $(MAKE) readme"
-
-darwin_prebuilt_app:
- @echo " "
- @echo "Deprecated!!"
- @echo "Use make extended_app_install"
-
diff --git a/packages/patches/complete_version_defines-0.39.2.patch b/packages/patches/complete_version_defines-0.39.2.patch
index 9ca16f52..605ba3ba 100644
--- a/packages/patches/complete_version_defines-0.39.2.patch
+++ b/packages/patches/complete_version_defines-0.39.2.patch
@@ -1,15 +1,31 @@
+Index: m_pd.h
+===================================================================
+RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v
+retrieving revision 1.8
+diff -u -w -r1.8 m_pd.h
+--- m_pd.h 19 Aug 2005 23:28:03 -0000 1.8
++++ m_pd.h 19 Mar 2006 04:13:32 -0000
+@@ -10,6 +10,8 @@
+
+ #define PD_MAJOR_VERSION 0
+ #define PD_MINOR_VERSION 39
++#define PD_BUGFIX_VERSION 2
++#define PD_TEST_VERSION ""
+
+ /* old name for "MSW" flag -- we have to take it for the sake of many old
+ "nmakefiles" for externs, which will define NT and not MSW */
Index: s_main.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_main.c,v
retrieving revision 1.20
diff -u -w -r1.20 s_main.c
--- s_main.c 2 Dec 2005 04:58:24 -0000 1.20
-+++ s_main.c 22 Feb 2006 05:54:28 -0000
++++ s_main.c 19 Mar 2006 04:13:32 -0000
@@ -2,10 +2,6 @@
* For information on usage and redistribution, and for a DISCLAIMER OF ALL
* WARRANTIES, see the file, "LICENSE.txt," in this distribution. */
--char pd_version[] = "Pd version 0.39-2\n"
+-char pd_version[] = "Pd version 0.39-2\n";
-char pd_compiletime[] = __TIME__;
-char pd_compiledate[] = __DATE__;
-
@@ -37,19 +53,3 @@ diff -u -w -r1.20 s_main.c
if (sys_verbose || sys_version) fprintf(stderr, "%scompiled %s %s\n",
pd_version, pd_compiletime, pd_compiledate);
if (sys_version) /* if we were just asked our version, exit here. */
-Index: m_pd.h
-===================================================================
-RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v
-retrieving revision 1.8
-diff -u -w -r1.8 m_pd.h
---- m_pd.h 19 Aug 2005 23:28:03 -0000 1.8
-+++ m_pd.h 22 Feb 2006 05:54:28 -0000
-@@ -10,6 +10,8 @@
-
- #define PD_MAJOR_VERSION 0
- #define PD_MINOR_VERSION 39
-+#define PD_BUGFIX_VERSION 2
-+#define PD_TEST_VERSION ""
-
- /* old name for "MSW" flag -- we have to take it for the sake of many old
- "nmakefiles" for externs, which will define NT and not MSW */
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-05 11:48:43 +0000