Use sdobjcopy instead of objcopy

ckormanyos · Jul 8, 2024 · 8ab4ac4 · 8ab4ac4
1 parent 66bf60e
commit 8ab4ac4
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 10 deletions.
diff --git a/.github/workflows/ti84-ref_app.yml b/.github/workflows/ti84-ref_app.yml
@@ -48,6 +48,6 @@ jobs:
         run: |
           cd build
           sdcc -v
-          make TYP_OS=UNIX all TYP_OBJCOPY=gobjcopy
+          make TYP_OS=UNIX all
           echo 'build-and-verify-refapp partial verify result'
           ls -la ../bin/refapp.8xp
diff --git a/bin/refapp.asm b/bin/refapp.asm
@@ -1,6 +1,6 @@
 ;--------------------------------------------------------
 ; File Created by SDCC : free open source ISO C Compiler 
-; Version 4.4.0 #14620 (MINGW32)
+; Version 4.4.0 #14620 (MINGW64)
 ;--------------------------------------------------------
 	.module app_main
 	.optsdcc -mz80

diff --git a/bin/refapp.lk b/bin/refapp.lk
@@ -2,7 +2,7 @@
 -i C:/Users/ckorm/Documents/Ks/uC_Software/Boards/ti84-ref_app/build/../bin/refapp.ihx
 -b _CODE = 0x9d9b
 -b _DATA = 0x0000
--k C:\Program Files (x86)\SDCC\bin\..\lib\z80
+-k C:\Program Files\SDCC\bin\..\lib\z80
 -l z80
 C:/Users/ckorm/Documents/Ks/uC_Software/Boards/ti84-ref_app/build/../bin/refapp.rel
 C:/Users/ckorm/Documents/Ks/uC_Software/Boards/ti84-ref_app/build/obj/app_hello.rel

diff --git a/bin/refapp.lst b/bin/refapp.lst
@@ -1,6 +1,6 @@
                                       1 ;--------------------------------------------------------
                                       2 ; File Created by SDCC : free open source ISO C Compiler 
-                                      3 ; Version 4.4.0 #14620 (MINGW32)
+                                      3 ; Version 4.4.0 #14620 (MINGW64)
                                       4 ;--------------------------------------------------------
                                       5 	.module app_main
                                       6 	.optsdcc -mz80

diff --git a/build/Makefile b/build/Makefile
@@ -65,11 +65,7 @@ CP              := $(TOOL_PREFIX)cp$(EXEEXT)
 ECHO            := $(TOOL_PREFIX)echo$(EXEEXT)
 MKDIR           := $(TOOL_PREFIX)mkdir$(EXEEXT)
 MV              := $(TOOL_PREFIX)mv$(EXEEXT)
-ifeq ($(TYP_OBJCOPY),)
-OBJCOPY         := $(TOOL_PREFIX)objcopy$(EXEEXT)
-else
-OBJCOPY         := $(TYP_OBJCOPY)
-endif
+OBJCOPY         := sdobjcopy$(EXEEXT)
 PYTHON          := python$(EXEEXT)
 RM              := $(TOOL_PREFIX)rm$(EXEEXT)
 

diff --git a/build/tools/UnxUtils/usr/local/wbin/objcopy.exe b/build/tools/UnxUtils/usr/local/wbin/objcopy.exe
diff --git a/readme.md b/readme.md
@@ -167,5 +167,4 @@ from this.
 
   - The source code written for this repo (in the [`src`](./src)) directory is licensed under [_The_ _Unlicense_](./LICENSE).
   - `Win*`-ported `*nix` tools in [`wbin`](./build/tools/UnxUtils/usr/local/wbin) originate from [UnxTools](https://sourceforge.net/projects/unxutils) and include their own [distribution statements](./build/tools/UnxUtils).
-  - The `Win*`-ported `objcopy.exe` originates from Steven T. Lavavej's [`MinGW Distro`](https://nuwen.net/mingw.html).
   - The `Win*`-ported GNUmake is taken from [`ckormanyos/make-4.2.1-msvc-build`](https://github.com/ckormanyos/make-4.2.1-msvc-build).