Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Handle copying modules a bit better #2, because I forgot to pass '-a'

  • Loading branch information...
commit 65ef64eb1ad6ca4e0cf593bf5931cdd157c270d1 1 parent aa370df
@duckinator authored
Showing with 3 additions and 6 deletions.
  1. +1 −1  Makefile
  2. +1 −4 makeiso.sh
  3. +1 −1  modules.mk
View
2  Makefile
@@ -69,7 +69,7 @@ hal.lib: $(filter src/metodo/hal/%.o, ${OBJFILES})
include modules.mk
-iso: metodo.exe
+iso: metodo.exe modules
@$(call STATUS,"Generating Dux.iso")
@./makeiso.sh
@$(call STATUS,"DONE")
View
5 makeiso.sh
@@ -20,10 +20,7 @@ for x in `find src -name '*.lib'`; do
cp $x isofs/System
done
-for x in `find src/modules -name '*.exe'`; do
- echo "Copying $x"
- cp $x isofs/Modules
-done
+./copymodules.sh
$isocmd -R -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -input-charset utf-8 -o dux.iso isofs
View
2  modules.mk
@@ -2,7 +2,7 @@
modules: metodo.exe test_module.exe uart.exe
@mkdir -p isofs/Modules
- @cp src/modules/test_module.exe isofs/Modules/
+ ./copymodules.sh
test_module.exe: krnllib.lib libc.lib src/modules/test_module/test_module.o
@${LD} -o src/modules/test_module/test_module.exe ${LDFLAGS} -Ttext 0x200000 src/modules/test_module/test_module.o -Lsrc/lib/krnllib src/lib/krnllib/krnllib.lib -Lsrc/lib/libc src/lib/libc/libc.lib
Please sign in to comment.
Something went wrong with that request. Please try again.