Usermode/AxWin4 - Debugging quirks in ARCH=native

[tpg/acess2.git] / Usermode / Applications / Makefile.tpl

diff --git a/Usermode/Applications/Makefile.tpl b/Usermode/Applications/Makefile.tpl
index 9cc0753..d72ac6a 100644 (file)
--- a/Usermode/Applications/Makefile.tpl
+++ b/Usermode/Applications/Makefile.tpl
@@ -19,6 +19,10 @@ LDFLAGS := $(subst -Map ,-Wl$(comma)-Map$(comma),$(LDFLAGS))
 _LIBS := $(filter -l%,$(LIBS))
 _LIBS := $(patsubst -l%,$(OUTPUTDIR)Libs/lib%.so,$(_LIBS))
 
+ifeq ($(ARCHDIR),native)
+ LDFLAGS := $(patsubst -lc++,-lc++_acess,$(LDFLAGS))
+ LIBS := $(patsubst -lc++,-lc++_acess,$(LIBS))
+endif
 ifeq ($(VERBOSE),)
 V := @
 else
@@ -47,7 +51,7 @@ install: $(_BIN)
        @$(xCP) $(_BIN)_ $(DISTROOT)/$(DIR)/$(BIN)
        @$(RM) $(_BIN)_
 
-$(_BIN): $(OUTPUTDIR)Libs/acess.ld $(_LIBS) $(LINK_OBJS)
+$(_BIN): $(_LIBS) $(LINK_OBJS) $(CRT0) $(CRTI) $(CRTN)
        @mkdir -p $(dir $(_BIN))
        @echo [LD] -o $@
 ifneq ($(USE_CXX_LINK),)