Skip to content
This repository
Browse code

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

  • Loading branch information...
commit 65ef64eb1ad6ca4e0cf593bf5931cdd157c270d1 1 parent aa370df
Nik Markwell authored August 01, 2012
2  Makefile
@@ -69,7 +69,7 @@ hal.lib: $(filter src/metodo/hal/%.o, ${OBJFILES})
69 69
 
70 70
 include modules.mk
71 71
 
72  
-iso: metodo.exe
  72
+iso: metodo.exe modules
73 73
 	@$(call STATUS,"Generating Dux.iso")
74 74
 	@./makeiso.sh
75 75
 	@$(call STATUS,"DONE")
5  makeiso.sh
@@ -20,10 +20,7 @@ for x in `find src -name '*.lib'`; do
20 20
   cp $x isofs/System
21 21
 done
22 22
 
23  
-for x in `find src/modules -name '*.exe'`; do
24  
-  echo "Copying $x"
25  
-  cp $x isofs/Modules
26  
-done
  23
+./copymodules.sh
27 24
 
28 25
 $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
29 26
 
2  modules.mk
@@ -2,7 +2,7 @@
2 2
 
3 3
 modules: metodo.exe test_module.exe uart.exe
4 4
 	@mkdir -p isofs/Modules
5  
-	@cp src/modules/test_module.exe isofs/Modules/
  5
+	./copymodules.sh
6 6
 
7 7
 test_module.exe: krnllib.lib libc.lib src/modules/test_module/test_module.o
8 8
 	@${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

0 notes on commit 65ef64e

Please sign in to comment.
Something went wrong with that request. Please try again.