Commit d4daacdc authored by Albert Gräf's avatar Albert Gräf
Browse files

Try to make the Windows/mingw build work again.

parent 1ce4a09c
...@@ -42,7 +42,11 @@ endif ...@@ -42,7 +42,11 @@ endif
@echo " " @echo " "
@echo "win32_inno install succeeded!" @echo "win32_inno install succeeded!"
build_pd: git_version: $(pd_src)/src/s_stuff.h.in
cd $(pd_src)/src/ && \
sed 's|^\(#define PD_BUILD_VERSION "\).*"|\1$(PD_BUILD_VERSION)"|' s_stuff.h.in > s_stuff.h
build_pd: git_version
cd $(pd_src)/src && $(MAKE) -f makefile.mingw cd $(pd_src)/src && $(MAKE) -f makefile.mingw
pd_install: build_pd pd_install: build_pd
......
...@@ -148,6 +148,11 @@ PD_VERSION := $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION) ...@@ -148,6 +148,11 @@ PD_VERSION := $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION)
ifneq ($(PD_TEST_VERSION),) ifneq ($(PD_TEST_VERSION),)
PD_VERSION := $(PD_VERSION)-$(PD_TEST_VERSION) PD_VERSION := $(PD_VERSION)-$(PD_TEST_VERSION)
endif endif
# AG: Pd-l2ork version number
PD_L2ORK_VERSION := $(shell grep PD_L2ORK_VERSION m_pd.h | \
sed 's|^.define *PD_L2ORK_VERSION *"\(.*\)".*|\1|' )
PD_BUILD_VERSION := $(shell grep PD_BUILD_VERSION s_stuff.h | \
sed 's|^.define *PD_BUILD_VERSION *"\(.*\)".*|\1|' )
# #
...@@ -294,7 +299,7 @@ install: all ...@@ -294,7 +299,7 @@ install: all
install -p ../doc/7.stuff/$$dir/*.* $(pddocdir)/7.stuff/$$dir ; \ install -p ../doc/7.stuff/$$dir/*.* $(pddocdir)/7.stuff/$$dir ; \
done done
mv $(ABOUT_FILE) $(ABOUT_FILE).tmp mv $(ABOUT_FILE) $(ABOUT_FILE).tmp
cat $(ABOUT_FILE).tmp | sed 's|PD_VERSION|Pd version $(PD_VERSION)|' \ cat $(ABOUT_FILE).tmp | sed 's|PD_VERSION|Pd version $(PD_L2ORK_VERSION) ($(PD_BUILD_VERSION))|' \
> $(ABOUT_FILE) > $(ABOUT_FILE)
rm $(ABOUT_FILE).tmp rm $(ABOUT_FILE).tmp
install -d $(libpddir)/extra install -d $(libpddir)/extra
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment