Commit bf33bcd0 authored by Ralph Giles's avatar Ralph Giles
Browse files

mingw: Use $(CURDIR) instead of ${PWD}.

This doesn't work in a normal shell, but enables 'make -C mingw'
which is convenient.

Thanks to ron for the suggestion.
parent 1cfda6a7
...@@ -23,7 +23,7 @@ to https://archive.mozilla.org/pub/opus/ ...@@ -23,7 +23,7 @@ to https://archive.mozilla.org/pub/opus/
Win32 binaries: Win32 binaries:
- Assuming the mingw cross toolchain: - Assuming the mingw cross toolchain:
- run cd mingw && make - run `make -C mingw`
- Downloads versions of libogg, opus, openssl. - Downloads versions of libogg, opus, openssl.
- Compiles them. - Compiles them.
- Compiles static opusfile and examples against the built deps. - Compiles static opusfile and examples against the built deps.
......
...@@ -17,12 +17,12 @@ ssl_SHA := b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 ...@@ -17,12 +17,12 @@ ssl_SHA := b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7
libopusfile-0.dll: ../unix/Makefile $(DEPS) libopusfile-0.dll: ../unix/Makefile $(DEPS)
CC=$(TOOL_PREFIX)-gcc \ CC=$(TOOL_PREFIX)-gcc \
RANLIB=$(TOOL_PREFIX)-ranlib \ RANLIB=$(TOOL_PREFIX)-ranlib \
PKG_CONFIG_PATH=${PWD}/lib/pkgconfig \ PKG_CONFIG_PATH=$(CURDIR)/lib/pkgconfig \
$(MAKE) -f $< $(MAKE) -f $<
opusfile: $(DEPS) opusfile: $(DEPS)
../configure --host=$(TOOL_PREFIX) --prefix=${PWD} \ ../configure --host=$(TOOL_PREFIX) --prefix=$(CURDIR) \
PKG_CONFIG_PATH=${PWD}/lib/pkgconfig PKG_CONFIG_PATH=$(CURDIR)/lib/pkgconfig
$(MAKE) $(MAKE)
clean: clean:
...@@ -57,18 +57,18 @@ $(foreach dep,$(DEPS),$(eval $(call WGET_template,$(dep)))) ...@@ -57,18 +57,18 @@ $(foreach dep,$(DEPS),$(eval $(call WGET_template,$(dep))))
# NOTE: 'make check' generally requires wine with cross-compiling. # NOTE: 'make check' generally requires wine with cross-compiling.
ogg_BUILD: $(ogg_DIR) ogg_BUILD: $(ogg_DIR)
cd $< && ./configure --host=$(TOOL_PREFIX) --prefix=${PWD} cd $< && ./configure --host=$(TOOL_PREFIX) --prefix=$(CURDIR)
$(MAKE) -C $< check $(MAKE) -C $< check
$(MAKE) -C $< install $(MAKE) -C $< install
opus_BUILD: $(opus_DIR) opus_BUILD: $(opus_DIR)
cd $< && ./configure --host=$(TOOL_PREFIX) --prefix=${PWD} cd $< && ./configure --host=$(TOOL_PREFIX) --prefix=$(CURDIR)
$(MAKE) -C $< check $(MAKE) -C $< check
$(MAKE) -C $< install $(MAKE) -C $< install
ssl_BUILD: $(ssl_DIR) ssl_BUILD: $(ssl_DIR)
cd $< && ./Configure shared mingw64 no-asm \ cd $< && ./Configure shared mingw64 no-asm \
--prefix=${PWD} \ --prefix=$(CURDIR) \
--cross-compile-prefix=$(TOOL_PREFIX)- --cross-compile-prefix=$(TOOL_PREFIX)-
$(MAKE) -C $< depend $(MAKE) -C $< depend
$(MAKE) -C $< $(MAKE) -C $<
......
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