zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-02-02 20:01:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove ebacktrace1.dll from 'make all' and include a prebuilt one in package/. Build it with 'make ebacktrace'.

Browse source 
synthesis.sh updated.

git-svn-id: https://svn.eduke32.com/eduke32@3236 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2012-11-26 08:24:54 +00:00
parent 9d2c19bcca
commit b304360c87
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
polymer/eduke32/Makefile
View file

@ -84,15 +84,12 @@ ifneq ($(PLATFORM),WII)
endif endif
EBACKTRACEDLL ?= ebacktrace1.dll EBACKTRACEDLL ?= ebacktrace1.dll
EBACKTRACEDLL_TARGET:= EBACKTRACEDLL_TARGET:=$(EBACKTRACEDLL)
ifeq ($(PLATFORM),WINDOWS) ifeq ($(PLATFORM),WINDOWS)
OBJ=obj_win OBJ=obj_win
EOBJ=eobj_win EOBJ=eobj_win
LIBS+= $(L_SSP) -Wl,--enable-auto-import LIBS+= $(L_SSP) -Wl,--enable-auto-import
ifeq (0,$(RELEASE))
EBACKTRACEDLL_TARGET=$(EBACKTRACEDLL)
endif
else else
ifeq ($(PLATFORM),LINUX) ifeq ($(PLATFORM),LINUX)
LIBS+= -ldl -lrt LIBS+= -ldl -lrt
@ -330,13 +327,15 @@ endif
UTILOBJS=$(OBJ)/ivfrate.$o UTILOBJS=$(OBJ)/ivfrate.$o
UTILS=ivfrate$(EXESUFFIX) UTILS=ivfrate$(EXESUFFIX)
all: start $(EDUKE32_TARGET) $(MAPSTER32_TARGET) $(EBACKTRACEDLL_TARGET) finish all: start $(EDUKE32_TARGET) $(MAPSTER32_TARGET) finish
ifneq (,$(EDUKE32_TARGET)) ifneq (,$(EDUKE32_TARGET))
@ls -l $(EDUKE32) @ls -l $(EDUKE32)
endif endif
ifneq (,$(MAPSTER32_TARGET)) ifneq (,$(MAPSTER32_TARGET))
@ls -l $(MAPSTER32) @ls -l $(MAPSTER32)
endif endif
ebacktrace: start $(EBACKTRACEDLL_TARGET) finish
ifneq (,$(EBACKTRACEDLL_TARGET)) ifneq (,$(EBACKTRACEDLL_TARGET))
@ls -l $(EBACKTRACEDLL) @ls -l $(EBACKTRACEDLL)
endif endif

BIN
polymer/eduke32/package/ebacktrace1.dll Normal file
View file

Binary file not shown.

4
polymer/synthesis.sh
View file

@ -11,7 +11,7 @@ clean=veryclean
# the following file paths are relative to $source # the following file paths are relative to $source
targets=( eduke32.exe mapster32.exe ) targets=( eduke32.exe mapster32.exe )
package=package package=package
not_src_packaged=( psd source/jaudiolib/third-party/vorbis.framework/Versions/A/vorbis Apple/lib ) not_src_packaged=( psd source/jaudiolib/third-party/vorbis.framework/Versions/A/vorbis Apple/lib $package/ebacktrace1.dll )
# group that owns the resulting packages # group that owns the resulting packages
group=dukeworld group=dukeworld
@ -89,8 +89,6 @@ then
mv -f eduke32.exe "$package/eduke32.debug.exe" mv -f eduke32.exe "$package/eduke32.debug.exe"
echo mv -f mapster32.exe "$package/mapster32.debug.exe" echo mv -f mapster32.exe "$package/mapster32.debug.exe"
mv -f mapster32.exe "$package/mapster32.debug.exe" mv -f mapster32.exe "$package/mapster32.debug.exe"
echo mv -f ebacktrace1.dll "$package/ebacktrace1.dll"
mv -f ebacktrace1.dll "$package/ebacktrace1.dll"
# clean the tree and build release # clean the tree and build release
echo "${make[@]}" $clean all echo "${make[@]}" $clean all