From 7e62f10728b15e1216295aaf031175ccf7a290d6 Mon Sep 17 00:00:00 2001 From: Plagman Date: Fri, 9 Nov 2012 16:00:37 +0000 Subject: [PATCH] Fix synthesis fallout after ivfrate addition. git-svn-id: https://svn.eduke32.com/eduke32@3135 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/Makefile | 6 ++++-- polymer/synthesis.sh | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile index c57a30f66..0a95da787 100644 --- a/polymer/eduke32/Makefile +++ b/polymer/eduke32/Makefile @@ -79,7 +79,7 @@ endif EDUKE32 ?= eduke32$(EXESUFFIX) MAPSTER32 ?= mapster32$(EXESUFFIX) -IVFRATE ?= ivfrate$(EXESUFFIX) +IVFRATE ?= samples/ivfrate$(EXESUFFIX) EDUKE32_TARGET:=$(EDUKE32) ifneq ($(PLATFORM),WII) @@ -89,6 +89,8 @@ endif EBACKTRACEDLL ?= ebacktrace1.dll EBACKTRACEDLL_TARGET:= +IVFRATE_TARGET:=$(IVFRATE) + ifeq ($(PLATFORM),WINDOWS) OBJ=obj_win EOBJ=eobj_win @@ -348,7 +350,7 @@ endif # TARGETS -all: notice $(EDUKE32_TARGET) $(MAPSTER32_TARGET) $(EBACKTRACEDLL_TARGET) +all: notice $(EDUKE32_TARGET) $(MAPSTER32_TARGET) $(EBACKTRACEDLL_TARGET) $(IVFRATE_TARGET) all: $(BUILD_FINISHED) diff --git a/polymer/synthesis.sh b/polymer/synthesis.sh index a17093fd3..cb4b00dd2 100755 --- a/polymer/synthesis.sh +++ b/polymer/synthesis.sh @@ -9,8 +9,8 @@ make=( make PLATFORM=WINDOWS CC='wine gcc' CXX='wine g++' AS='wine nasm' RC='win clean=veryclean # the following file paths are relative to $source -targets=( eduke32.exe mapster32.exe ivfrate.exe ) -bin_packaged=( eduke32.exe eduke32.debug.exe mapster32.exe mapster32.debug.exe ivfrate.exe ebacktrace1.dll SEHELP.HLP STHELP.HLP names.h buildlic.txt GNU.TXT m32help.hlp nedmalloc.dll tiles.cfg samples/* ) +targets=( eduke32.exe mapster32.exe samples/ivfrate.exe ) +bin_packaged=( eduke32.exe eduke32.debug.exe mapster32.exe mapster32.debug.exe ebacktrace1.dll SEHELP.HLP STHELP.HLP names.h buildlic.txt GNU.TXT m32help.hlp nedmalloc.dll tiles.cfg samples/* ) not_src_packaged=( psd source/jaudiolib/third-party/vorbis.framework/Versions/A/vorbis Apple/lib ) # group that owns the resulting packages