diff options
| author | /dev/humancontroller <devhc@example.com> | 2017-04-15 14:22:12 +0200 |
|---|---|---|
| committer | /dev/humancontroller <devhc@example.com> | 2017-04-15 14:22:12 +0200 |
| commit | 4096a848870f5644edf424012bee4616646fa0dd (patch) | |
| tree | afacee526e4688221f45e9b112663ffdbafc6301 | |
| parent | 8c5e6c88a66dc6693fc74285e41e215da9ba5685 (diff) | |
stop embedding the architecture in the filenames of binaries and libraries
| -rw-r--r-- | GNUmakefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/GNUmakefile b/GNUmakefile index 419efdb..47bb84d 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -907,11 +907,11 @@ endif TARGETS = ifndef FULLBINEXT - FULLBINEXT=.$(ARCH)$(BINEXT) + FULLBINEXT=$(BINEXT) endif ifndef SHLIBNAME - SHLIBNAME=$(ARCH).$(SHLIBEXT) + SHLIBNAME=.$(SHLIBEXT) endif ifneq ($(BUILD_SERVER),0) @@ -920,9 +920,9 @@ endif ifneq ($(BUILD_CLIENT),0) ifneq ($(USE_RENDERER_DLOPEN),0) - TARGETS += $(B)/$(OUT)/$(CLIENTBIN)$(FULLBINEXT) $(B)/$(OUT)/renderer_opengl1_$(SHLIBNAME) + TARGETS += $(B)/$(OUT)/$(CLIENTBIN)$(FULLBINEXT) $(B)/$(OUT)/renderer_opengl1$(SHLIBNAME) ifneq ($(BUILD_RENDERER_OPENGL2),0) - TARGETS += $(B)/$(OUT)/renderer_opengl2_$(SHLIBNAME) + TARGETS += $(B)/$(OUT)/renderer_opengl2$(SHLIBNAME) endif else TARGETS += $(B)/$(OUT)/$(CLIENTBIN)$(FULLBINEXT) @@ -1954,12 +1954,12 @@ $(B)/$(OUT)/$(CLIENTBIN)$(FULLBINEXT): $(Q3OBJ) $(LIBSDLMAIN) -o $@ $(Q3OBJ) \ $(LIBSDLMAIN) $(CLIENT_LIBS) $(LIBS) -$(B)/$(OUT)/renderer_opengl1_$(SHLIBNAME): $(Q3ROBJ) $(JPGOBJ) +$(B)/$(OUT)/renderer_opengl1$(SHLIBNAME): $(Q3ROBJ) $(JPGOBJ) $(echo_cmd) "LD $@" $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3ROBJ) $(JPGOBJ) \ $(THREAD_LIBS) $(LIBSDLMAIN) $(RENDERER_LIBS) $(LIBS) -$(B)/$(OUT)/renderer_opengl2_$(SHLIBNAME): $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(JPGOBJ) +$(B)/$(OUT)/renderer_opengl2$(SHLIBNAME): $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(JPGOBJ) $(echo_cmd) "LD $@" $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(JPGOBJ) \ $(THREAD_LIBS) $(LIBSDLMAIN) $(RENDERER_LIBS) $(LIBS) |