X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Fld-acess_src%2FMakefile;h=bbaef1deaee9cb3ff0d094abb29f48d14d36e440;hb=34762f54f93dac3c12c8fb5be56ffb0e74e72299;hp=805b3a5f0fe3db4aa6f7441277d320d5c77ba36a;hpb=57e4db716b3e7db0be336abd9f256962e3b19aa3;p=tpg%2Facess2.git

diff --git a/AcessNative/ld-acess_src/Makefile b/AcessNative/ld-acess_src/Makefile
index 805b3a5f..bbaef1de 100644
--- a/AcessNative/ld-acess_src/Makefile
+++ b/AcessNative/ld-acess_src/Makefile
@@ -11,6 +11,7 @@ OBJ := $(addprefix obj-$(PLATFORM)/,$(OBJ))
 
 ifeq ($(PLATFORM),win)
 	BIN := ../ld-acess.exe
+	LDFLAGS += -lws2_32
 endif
 ifeq ($(PLATFORM),lin)
 	BIN := ../ld-acess
@@ -35,7 +36,7 @@ clean:
 	$(RM) $(BIN) $(OBJ) $(DEPFILES) obj-$(PLATFORM)/link.ld
 
 $(BIN): obj-$(PLATFORM)/link.ld $(OBJ)
-	$(CC) $(LDFLAGS) -o $@ $(OBJ)
+	$(CC) -o $@ $(OBJ) $(LDFLAGS)
 	objdump -S $@ > $@.dsm
 
 obj-$(PLATFORM)/%.o: %.c
@@ -50,5 +51,11 @@ obj-lin/link.ld: Makefile
 	@echo "Making Linker Script ($@)"
 	$(LD) -g --verbose | awk '{ if( substr($$1,0,5) == "====="){ bPrint = !bPrint; } else { if(bPrint){ print $$0;} } }' | sed 's/\b0x[048][0-9]*\b/$(LINKADDR)/g' | sed 's/CONSTANT (MAXPAGESIZE)/0x1000/g' > $@
 
+# Modify the default makefile to put the executable at 1MB instead
+obj-win/link.ld: Makefile
+	@mkdir -p $(dir $@)
+	@echo "Making Linker Script ($@)"
+	$(LD) -g --verbose | awk '{ if( substr($$1,0,5) == "====="){ bPrint = !bPrint; } else { if(bPrint){ print $$0;} } }' | sed 's/\b0x[048][0-9]*\b/$(LINKADDR)/g' | sed 's/CONSTANT (MAXPAGESIZE)/0x1000/g' > $@
+
 -include $(DEPFILES)