Rev 4715 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 4715 | Rev 4730 | ||
---|---|---|---|
Line 276... | Line 276... | ||
276 | 276 | ||
277 | # The list of all C-- programs with one main C-- file. |
277 | # The list of all C-- programs with one main C-- file. |
278 | # Format of an item is exactly the same as in the previous list, |
278 | # Format of an item is exactly the same as in the previous list, |
279 | # except that there can be fourth field with parameters for a compiler. |
279 | # except that there can be fourth field with parameters for a compiler. |
280 | CMM_PROGRAMS:=\ |
280 | CMM_PROGRAMS:=\ |
281 | File|Managers/eolite:File|Managers/EOLITE:$(PROGS)/cmm/eolite/Eolite.c \ |
281 | #File|Managers/eolite:File|Managers/EOLITE:$(PROGS)/cmm/eolite/Eolite.c \ |
282 | games/clicks:GAMES/CLICKS:$(PROGS)/games/clicks/trunk/clicks.c \ |
282 | games/clicks:GAMES/CLICKS:$(PROGS)/games/clicks/trunk/clicks.c \ |
283 | games/FindNumbers:GAMES/FindNumbers:$(PROGS)/games/FindNumbers/trunk/FindNumbers.c-- \ |
283 | games/FindNumbers:GAMES/FindNumbers:$(PROGS)/games/FindNumbers/trunk/FindNumbers.c-- \ |
284 | games/flood-it:GAMES/flood-it:$(PROGS)/games/flood-it/trunk/flood-it.c \ |
284 | games/flood-it:GAMES/flood-it:$(PROGS)/games/flood-it/trunk/flood-it.c \ |
285 | games/mine:GAMES/MINE:$(PROGS)/games/mine/trunk/mine.c--:/MEOS \ |
285 | games/mine:GAMES/MINE:$(PROGS)/games/mine/trunk/mine.c--:/MEOS \ |
Line 293... | Line 293... | ||
293 | # Some of them are auto-built with special rules, some just exist before build. |
293 | # Some of them are auto-built with special rules, some just exist before build. |
294 | # Each item is of the form |
294 | # Each item is of the form |
295 | # Spaces should be represented as |. |
295 | # Spaces should be represented as |. |
296 | OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \ |
296 | OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \ |
297 | default.skn:DEFAULT.SKN \ |
297 | default.skn:DEFAULT.SKN \ |
298 | graph:GRAPH \ |
298 | #graph:GRAPH \ |
299 | settings/icon.ini:SETTINGS/ICON.INI \ |
299 | settings/icon.ini:SETTINGS/ICON.INI \ |
300 | ../common/iconstrp.png:ICONSTRP.PNG index_htm:INDEX.HTM \ |
300 | ../common/iconstrp.png:ICONSTRP.PNG index_htm:INDEX.HTM \ |
301 | kernel.mnt:KERNEL.MNT \ |
301 | kernel.mnt:KERNEL.MNT \ |
302 | ../common/kerpack:KERPACK \ |
302 | ../common/kerpack:KERPACK \ |
303 | settings/keymap.key:SETTINGS/KEYMAP.KEY \ |
303 | settings/keymap.key:SETTINGS/KEYMAP.KEY \ |
Line 344... | Line 344... | ||
344 | cut -f1 $< | $(SHELL) $(REPOSITORY)/data/generate_makefile_skins.sh > $@ |
344 | cut -f1 $< | $(SHELL) $(REPOSITORY)/data/generate_makefile_skins.sh > $@ |
345 | include Makefile.skins |
345 | include Makefile.skins |
Line 346... | Line 346... | ||
346 | 346 | ||
347 | # Extra targets for LiveCD image in the syntax of mkisofs |
347 | # Extra targets for LiveCD image in the syntax of mkisofs |
348 | MKISOFS_EXTRA:=\ |
348 | MKISOFS_EXTRA:=\ |
349 | emu/e80/e80=e80 \ |
349 | #emu/e80/e80=e80 \ |
350 | emu/dosbox/=$(PROGS)/emulator/DosBox/dosbox \ |
350 | emu/dosbox/=$(PROGS)/emulator/DosBox/dosbox \ |
351 | emu/dosbox/=$(PROGS)/emulator/DosBox/dosbox.conf \ |
351 | emu/dosbox/=$(PROGS)/emulator/DosBox/dosbox.conf \ |
352 | emu/dosbox/=$(PROGS)/emulator/DosBox/readme.txt \ |
352 | emu/dosbox/=$(PROGS)/emulator/DosBox/readme.txt \ |
353 | /=distr_data/autorun.inf \ |
353 | /=distr_data/autorun.inf \ |
Line 398... | Line 398... | ||
398 | kolibrios/lib/pixlib.dll=../common/lib/pixlib.dll \ |
398 | kolibrios/lib/pixlib.dll=../common/lib/pixlib.dll \ |
399 | kolibrios/lib/swresample-0.dll=../common/lib/swresample-0.dll \ |
399 | kolibrios/lib/swresample-0.dll=../common/lib/swresample-0.dll \ |
400 | kolibrios/lib/swscale-2.dll=../common/lib/swscale-2.dll \ |
400 | kolibrios/lib/swscale-2.dll=../common/lib/swscale-2.dll \ |
401 | kolibrios/lib/zlib.dll=../common/lib/zlib.dll \ |
401 | kolibrios/lib/zlib.dll=../common/lib/zlib.dll \ |
402 | kolibrios/media/fplay-full=../common/media/fplay-full \ |
402 | kolibrios/media/fplay-full=../common/media/fplay-full \ |
403 | #kolibrios/media/updf=updf \ |
403 | kolibrios/media/updf=../../contrib/media/updf/build/debug/mupdf \ |
404 | kolibrios/media/zsea/zsea=distr_data/zsea \ |
404 | kolibrios/media/zsea/zsea=distr_data/zsea \ |
405 | kolibrios/media/zsea/plugins/cnv_bmp.obj=distr_data/cnv_bmp.obj \ |
405 | kolibrios/media/zsea/plugins/cnv_bmp.obj=distr_data/cnv_bmp.obj \ |
406 | kolibrios/media/zsea/plugins/cnv_gif.obj=distr_data/cnv_gif.obj \ |
406 | kolibrios/media/zsea/plugins/cnv_gif.obj=distr_data/cnv_gif.obj \ |
407 | kolibrios/media/zsea/plugins/cnv_jpeg.obj=distr_data/cnv_jpeg.obj \ |
407 | kolibrios/media/zsea/plugins/cnv_jpeg.obj=distr_data/cnv_jpeg.obj \ |
408 | kolibrios/media/zsea/plugins/convert.obj=distr_data/convert.obj \ |
408 | kolibrios/media/zsea/plugins/convert.obj=distr_data/convert.obj \ |
Line 536... | Line 536... | ||
536 | # command lines for compiling and linking, and |
536 | # command lines for compiling and linking, and |
537 | # maintain the list of sources and objects by hand. |
537 | # maintain the list of sources and objects by hand. |
538 | include Makefile.msvc |
538 | include Makefile.msvc |
Line 539... | Line 539... | ||
539 | 539 | ||
540 | # Rules for table |
540 | # Rules for table |
541 | table: .obj.table/table.exe |
541 | table: .obj.table/table.exe updf |
542 | $(msvc_final) |
542 | $(msvc_final) |
543 | TABLE_OBJECTS:=.obj.table/calc.obj .obj.table/func.obj .obj.table/hello.obj \ |
543 | TABLE_OBJECTS:=.obj.table/calc.obj .obj.table/func.obj .obj.table/hello.obj \ |
544 | .obj.table/KosFile.obj .obj.table/kosSyst.obj .obj.table/math2.obj \ |
544 | .obj.table/KosFile.obj .obj.table/kosSyst.obj .obj.table/math2.obj \ |
545 | .obj.table/mcsmemm.obj .obj.table/parser.obj |
545 | .obj.table/mcsmemm.obj .obj.table/parser.obj |
Line 623... | Line 623... | ||
623 | .obj.e80/start.o: $(E80DIR)/asm_code.asm | .obj.e80 |
623 | .obj.e80/start.o: $(E80DIR)/asm_code.asm | .obj.e80 |
624 | fasm $< $@ |
624 | fasm $< $@ |
625 | .obj.e80: |
625 | .obj.e80: |
626 | mkdir -p .obj.e80 |
626 | mkdir -p .obj.e80 |
Line 627... | Line -... | ||
627 | - | ||
628 | #Rules for updf |
- | |
629 | UPDFDIR=$(REPOSITORY)/contrib/media/updf |
- | |
630 | updf: .obj.updf/mupdf.obj |
- | |
631 | win32-objcopy -O binary mupdf |
- | |
632 | .obj.updf/mupdf.obj: $(UPDFDIR)/Makefile |
- | |
633 | flock $(UPDFDIR)/.lock \ |
- | |
634 | $(MAKE) CC=win32-gcc45 AS=win32-as LD=win32-ld AR=win32-ar -C $(UPDFDIR) |
- | |
635 | .obj.updf: |
- | |
Line 636... | Line 627... | ||
636 | mkdir -p .obj.updf |
627 | |
637 | 628 | ||
638 | # Rules for sdk/sound, used by media/ac97snd |
629 | # Rules for sdk/sound, used by media/ac97snd |
639 | SOUNDDIR=$(PROGS)/develop/sdk/trunk/sound/src |
630 | SOUNDDIR=$(PROGS)/develop/sdk/trunk/sound/src |
Line 683... | Line 674... | ||
683 | # However, dependencies must be duplicated - I don't know how to avoid this |
674 | # However, dependencies must be duplicated - I don't know how to avoid this |
684 | # without need to rebuild kolibri.img at every iteration... |
675 | # without need to rebuild kolibri.img at every iteration... |
685 | # Note that we are going to write in the directory shared |
676 | # Note that we are going to write in the directory shared |
686 | # between all Makefiles, so we need locked operations. |
677 | # between all Makefiles, so we need locked operations. |
687 | drivers/atikms.dll: $(REPOSITORY)/drivers/video/drm/radeon/atikms.dll drivers/.dir |
678 | drivers/atikms.dll: $(REPOSITORY)/drivers/video/drm/radeon/atikms.dll drivers/.dir |
688 | kpack --nologo $< $@ |
679 | kpack.o --nologo $< $@ |
689 | $(REPOSITORY)/drivers/video/drm/radeon/atikms.dll: $(REPOSITORY)/drivers/video/drm/radeon/Makefile.lto |
680 | $(REPOSITORY)/drivers/video/drm/radeon/atikms.dll: $(REPOSITORY)/drivers/video/drm/radeon/Makefile.lto |
690 | flock $(REPOSITORY)/drivers/video/drm/radeon/.lock \ |
681 | flock $(REPOSITORY)/drivers/video/drm/radeon/.lock \ |
691 | $(MAKE) CC=win32-gcc45 AS=win32-as LD=win32-ld AR=win32-ar FASM=fasm -C $(REPOSITORY)/drivers/video/drm/radeon -f Makefile.lto |
682 | $(MAKE) CC=win32-gcc45 AS=win32-as LD=win32-ld AR=win32-ar FASM=fasm -C $(REPOSITORY)/drivers/video/drm/radeon -f Makefile.lto |
692 | $(REPOSITORY)/drivers/ddk/libddk.a: $(REPOSITORY)/drivers/ddk/Makefile |
683 | $(REPOSITORY)/drivers/ddk/libddk.a: $(REPOSITORY)/drivers/ddk/Makefile |
693 | flock $(REPOSITORY)/drivers/ddk/.lock \ |
684 | flock $(REPOSITORY)/drivers/ddk/.lock \ |
Line 714... | Line 705... | ||
714 | $(REPOSITORY)/drivers/include/*/*.h \ |
705 | $(REPOSITORY)/drivers/include/*/*.h \ |
715 | $(REPOSITORY)/drivers/include/*/*/*.h \ |
706 | $(REPOSITORY)/drivers/include/*/*/*.h \ |
716 | $(REPOSITORY)/drivers/include/*/*/*/*.h |
707 | $(REPOSITORY)/drivers/include/*/*/*/*.h |
717 | $(REPOSITORY)/drivers/ddk/libcore.a: \ |
708 | $(REPOSITORY)/drivers/ddk/libcore.a: \ |
718 | $(REPOSITORY)/drivers/ddk/core.S>>>>>>> |
709 | $(REPOSITORY)/drivers/ddk/core.S |
- | 710 | ||
- | 711 | ||
- | 712 | ||
- | 713 | #Rules for updf |
|
- | 714 | UPDFDIR=$(REPOSITORY)/contrib/media/updf |
|
- | 715 | updf: |
|
- | 716 | $(MAKE) CC=win32-gcc45 AS=win32-as LD=win32-ld AR=win32-ar -C $(UPDFDIR) |
|
- | 717 | cd $(UPDFDIR)/build/debug && objcopy -O binary mupdf && kpack --nologo mupdf>>>>>>> |
|
719 | .obj.shell/start.o:>>> |
718 | .obj.shell/start.o:>>> |