XenOn/kolibrios-fun
1
1
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Wiki Activity

move tinygl.obj to /sys/lib, fix path

Browse Source 
git-svn-id: svn://kolibrios.org@6737 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2016-11-22 12:21:04 +00:00
parent 6a851c29a8
commit f26b88fc9a
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/Tupfile.lua
View File

@ -228,7 +228,6 @@ extra_files = {
{"kolibrios/lib/swresample-1.dll", "common/lib/swresample-1.dll"}, {"kolibrios/lib/swresample-1.dll", "common/lib/swresample-1.dll"},
{"kolibrios/lib/i915_dri.drv", "common/lib/i915_dri.drv"}, {"kolibrios/lib/i915_dri.drv", "common/lib/i915_dri.drv"},
{"kolibrios/lib/i965_dri.drv", "common/lib/i965_dri.drv"}, {"kolibrios/lib/i965_dri.drv", "common/lib/i965_dri.drv"},
{"kolibrios/lib/tinygl.obj", PROGS .. "/develop/libraries/TinyGL/asm_fork/tinygl.obj"},
{"kolibrios/media/fplay", "common/media/fplay"}, {"kolibrios/media/fplay", "common/media/fplay"},
{"kolibrios/media/updf", "common/media/updf"}, {"kolibrios/media/updf", "common/media/updf"},
{"kolibrios/media/vttf", "common/media/vttf"}, {"kolibrios/media/vttf", "common/media/vttf"},
@ -417,17 +416,18 @@ tup.append_table(img_files, {
{"LIB/BOX_LIB.OBJ", PROGS .. "/develop/libraries/box_lib/trunk/box_lib.obj"}, {"LIB/BOX_LIB.OBJ", PROGS .. "/develop/libraries/box_lib/trunk/box_lib.obj"},
{"LIB/BUF2D.OBJ", PROGS .. "/develop/libraries/buf2d/trunk/buf2d.obj"}, {"LIB/BUF2D.OBJ", PROGS .. "/develop/libraries/buf2d/trunk/buf2d.obj"},
{"LIB/CONSOLE.OBJ", PROGS .. "/develop/libraries/console_coff/console.obj"}, {"LIB/CONSOLE.OBJ", PROGS .. "/develop/libraries/console_coff/console.obj"},
{"LIB/CNV_PNG.OBJ", PROGS .. "/media/zsea/plugins/png/cnv_png.obj"},
{"LIB/HTTP.OBJ", PROGS .. "/develop/libraries/http/http.obj"},
{"LIB/LIBGFX.OBJ", PROGS .. "/develop/libraries/libs-dev/libgfx/libgfx.obj"}, {"LIB/LIBGFX.OBJ", PROGS .. "/develop/libraries/libs-dev/libgfx/libgfx.obj"},
{"LIB/LIBIMG.OBJ", PROGS .. "/develop/libraries/libs-dev/libimg/libimg.obj"}, {"LIB/LIBIMG.OBJ", PROGS .. "/develop/libraries/libs-dev/libimg/libimg.obj"},
{"LIB/LIBINI.OBJ", PROGS .. "/develop/libraries/libs-dev/libini/libini.obj"}, {"LIB/LIBINI.OBJ", PROGS .. "/develop/libraries/libs-dev/libini/libini.obj"},
{"LIB/LIBIO.OBJ", PROGS .. "/develop/libraries/libs-dev/libio/libio.obj"}, {"LIB/LIBIO.OBJ", PROGS .. "/develop/libraries/libs-dev/libio/libio.obj"},
{"LIB/MSGBOX.OBJ", PROGS .. "/develop/libraries/msgbox/msgbox.obj"}, {"LIB/MSGBOX.OBJ", PROGS .. "/develop/libraries/msgbox/msgbox.obj"},
{"LIB/NETWORK.OBJ", PROGS .. "/develop/libraries/network/network.obj"}, {"LIB/NETWORK.OBJ", PROGS .. "/develop/libraries/network/network.obj"},
{"LIB/PROC_LIB.OBJ", PROGS .. "/develop/libraries/proc_lib/trunk/proc_lib.obj"},
{"LIB/RASTERWORKS.OBJ", PROGS .. "/develop/libraries/fontRasterWorks(unicode)/RasterWorks.obj"}, {"LIB/RASTERWORKS.OBJ", PROGS .. "/develop/libraries/fontRasterWorks(unicode)/RasterWorks.obj"},
{"LIB/SORT.OBJ", PROGS .. "/develop/libraries/sorter/sort.obj"}, {"LIB/SORT.OBJ", PROGS .. "/develop/libraries/sorter/sort.obj"},
{"LIB/HTTP.OBJ", PROGS .. "/develop/libraries/http/http.obj"}, {"LIB/TINYGL.OBJ", PROGS .. "/develop/libraries/TinyGL/asm_fork/tinygl.obj"},
{"LIB/PROC_LIB.OBJ", PROGS .. "/develop/libraries/proc_lib/trunk/proc_lib.obj"},
{"LIB/CNV_PNG.OBJ", PROGS .. "/media/zsea/plugins/png/cnv_png.obj"},
{"MEDIA/ANIMAGE", PROGS .. "/media/animage/trunk/animage"}, {"MEDIA/ANIMAGE", PROGS .. "/media/animage/trunk/animage"},
{"MEDIA/KIV", PROGS .. "/media/kiv/trunk/kiv"}, {"MEDIA/KIV", PROGS .. "/media/kiv/trunk/kiv"},
{"MEDIA/LISTPLAY", PROGS .. "/media/listplay/trunk/listplay"}, {"MEDIA/LISTPLAY", PROGS .. "/media/listplay/trunk/listplay"},

2
programs/develop/libraries/TinyGL/asm_fork/examples/gears.asm
View File

@ -878,7 +878,7 @@ macro E_LIB n
include '../export.inc' include '../export.inc'
;-------------------------------------------------- ;--------------------------------------------------
system_path db '/kolibrios/lib/' system_path db '/sys/lib/'
name_tgl db 'tinygl.obj',0 name_tgl db 'tinygl.obj',0
err_message_found_lib db 'Sorry I cannot load library tinygl.obj',0 err_message_found_lib db 'Sorry I cannot load library tinygl.obj',0
head_f_i: head_f_i:

2
programs/develop/libraries/TinyGL/asm_fork/examples/test_glu1.asm
View File

@ -477,7 +477,7 @@ import_libimg:
aimg_draw db 'img_draw',0 aimg_draw db 'img_draw',0
;-------------------------------------------------- ;--------------------------------------------------
system_dir_0 db '/kolibrios/lib/' system_dir_0 db '/sys/lib/'
lib_name_0 db 'tinygl.obj',0 lib_name_0 db 'tinygl.obj',0
system_dir_1 db '/sys/lib/' system_dir_1 db '/sys/lib/'
lib_name_1 db 'buf2d.obj',0 lib_name_1 db 'buf2d.obj',0

2
programs/develop/libraries/TinyGL/asm_fork/examples/test_glu2.asm
View File

@ -469,7 +469,7 @@ import_libimg:
aimg_draw db 'img_draw',0 aimg_draw db 'img_draw',0
;-------------------------------------------------- ;--------------------------------------------------
system_dir_0 db '/kolibrios/lib/' system_dir_0 db '/sys/lib/'
lib_name_0 db 'tinygl.obj',0 lib_name_0 db 'tinygl.obj',0
system_dir_1 db '/sys/lib/' system_dir_1 db '/sys/lib/'
lib_name_1 db 'buf2d.obj',0 lib_name_1 db 'buf2d.obj',0

2
programs/develop/libraries/TinyGL/asm_fork/examples/textures1.asm
View File

@ -458,7 +458,7 @@ import_libimg:
aimg_draw db 'img_draw',0 aimg_draw db 'img_draw',0
;-------------------------------------------------- ;--------------------------------------------------
system_dir_0 db '/kolibrios/lib/' system_dir_0 db '/sys/lib/'
lib_name_0 db 'tinygl.obj',0 lib_name_0 db 'tinygl.obj',0
system_dir_1 db '/sys/lib/' system_dir_1 db '/sys/lib/'
lib_name_1 db 'buf2d.obj',0 lib_name_1 db 'buf2d.obj',0