From f26b88fc9a0779a3132f2074fe5114d33ecc126b Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Tue, 22 Nov 2016 12:21:04 +0000
Subject: [PATCH] move tinygl.obj to /sys/lib, fix path

git-svn-id: svn://kolibrios.org@6737 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 data/Tupfile.lua                                          | 8 ++++----
 .../develop/libraries/TinyGL/asm_fork/examples/gears.asm  | 2 +-
 .../libraries/TinyGL/asm_fork/examples/test_glu1.asm      | 2 +-
 .../libraries/TinyGL/asm_fork/examples/test_glu2.asm      | 2 +-
 .../libraries/TinyGL/asm_fork/examples/textures1.asm      | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 493f4f0a34..4ef9627a2d 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -228,7 +228,6 @@ extra_files = {
  {"kolibrios/lib/swresample-1.dll", "common/lib/swresample-1.dll"},
  {"kolibrios/lib/i915_dri.drv", "common/lib/i915_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/updf", "common/media/updf"},
  {"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/BUF2D.OBJ", PROGS .. "/develop/libraries/buf2d/trunk/buf2d.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/LIBIMG.OBJ", PROGS .. "/develop/libraries/libs-dev/libimg/libimg.obj"},
  {"LIB/LIBINI.OBJ", PROGS .. "/develop/libraries/libs-dev/libini/libini.obj"},
  {"LIB/LIBIO.OBJ", PROGS .. "/develop/libraries/libs-dev/libio/libio.obj"},
  {"LIB/MSGBOX.OBJ", PROGS .. "/develop/libraries/msgbox/msgbox.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/SORT.OBJ", PROGS .. "/develop/libraries/sorter/sort.obj"},
- {"LIB/HTTP.OBJ", PROGS .. "/develop/libraries/http/http.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"},
+ {"LIB/TINYGL.OBJ", PROGS .. "/develop/libraries/TinyGL/asm_fork/tinygl.obj"},
  {"MEDIA/ANIMAGE", PROGS .. "/media/animage/trunk/animage"},
  {"MEDIA/KIV", PROGS .. "/media/kiv/trunk/kiv"},
  {"MEDIA/LISTPLAY", PROGS .. "/media/listplay/trunk/listplay"},
diff --git a/programs/develop/libraries/TinyGL/asm_fork/examples/gears.asm b/programs/develop/libraries/TinyGL/asm_fork/examples/gears.asm
index 72b9af9780..d5fbd85407 100644
--- a/programs/develop/libraries/TinyGL/asm_fork/examples/gears.asm
+++ b/programs/develop/libraries/TinyGL/asm_fork/examples/gears.asm
@@ -878,7 +878,7 @@ macro E_LIB n
 include '../export.inc'
 
 ;--------------------------------------------------
-system_path db '/kolibrios/lib/'
+system_path db '/sys/lib/'
 name_tgl db 'tinygl.obj',0
 err_message_found_lib db 'Sorry I cannot load library tinygl.obj',0
 head_f_i:
diff --git a/programs/develop/libraries/TinyGL/asm_fork/examples/test_glu1.asm b/programs/develop/libraries/TinyGL/asm_fork/examples/test_glu1.asm
index c5b0702bfc..85b45894c3 100644
--- a/programs/develop/libraries/TinyGL/asm_fork/examples/test_glu1.asm
+++ b/programs/develop/libraries/TinyGL/asm_fork/examples/test_glu1.asm
@@ -477,7 +477,7 @@ import_libimg:
 	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
 system_dir_1 db '/sys/lib/'
 lib_name_1 db 'buf2d.obj',0
diff --git a/programs/develop/libraries/TinyGL/asm_fork/examples/test_glu2.asm b/programs/develop/libraries/TinyGL/asm_fork/examples/test_glu2.asm
index d5315bf1c6..061a1b0607 100644
--- a/programs/develop/libraries/TinyGL/asm_fork/examples/test_glu2.asm
+++ b/programs/develop/libraries/TinyGL/asm_fork/examples/test_glu2.asm
@@ -469,7 +469,7 @@ import_libimg:
 	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
 system_dir_1 db '/sys/lib/'
 lib_name_1 db 'buf2d.obj',0
diff --git a/programs/develop/libraries/TinyGL/asm_fork/examples/textures1.asm b/programs/develop/libraries/TinyGL/asm_fork/examples/textures1.asm
index bc74e0922f..030ad78761 100644
--- a/programs/develop/libraries/TinyGL/asm_fork/examples/textures1.asm
+++ b/programs/develop/libraries/TinyGL/asm_fork/examples/textures1.asm
@@ -458,7 +458,7 @@ import_libimg:
 	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
 system_dir_1 db '/sys/lib/'
 lib_name_1 db 'buf2d.obj',0