diff options
| author | /dev/humancontroller <devhc@example.com> | 2015-06-18 14:18:03 +0200 |
|---|---|---|
| committer | /dev/humancontroller <devhc@example.com> | 2017-02-07 17:34:59 +0100 |
| commit | bea348d828fee2675edc5cfc9b18ad000a96a6ac (patch) | |
| tree | c8ae11fc1e9150a097d5f6e2aab4baf099e23942 /GNUmakefile | |
| parent | 7190d27a586ee1a4be4a550833f5ec91fca5402e (diff) | |
stop embedding the architecture in the filenames of binaries and libraries; change the library loader appropriately
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/GNUmakefile b/GNUmakefile index e0460c0f..339b28eb 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -874,11 +874,11 @@ endif TARGETS = ifndef FULLBINEXT - FULLBINEXT=.$(ARCH)$(BINEXT) + FULLBINEXT=$(BINEXT) endif ifndef SHLIBNAME - SHLIBNAME=$(ARCH).$(SHLIBEXT) + SHLIBNAME=.$(SHLIBEXT) endif ifeq ($(USE_INTERNAL_MINIZIP),1) @@ -898,9 +898,9 @@ ifneq ($(BUILD_CLIENT),0) CLIENT_CFLAGS += $(MINIZIP_CFLAGS) CLIENT_LIBS += $(MINIZIP_LIBS) 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) @@ -1930,12 +1930,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) |