diff --git a/trunk/ConsoleDataMigration/ConsoleBackup/OMakefile b/trunk/ConsoleDataMigration/ConsoleBackup/OMakefile index b152d3d..8b09b65 100644 --- a/trunk/ConsoleDataMigration/ConsoleBackup/OMakefile +++ b/trunk/ConsoleDataMigration/ConsoleBackup/OMakefile @@ -65,7 +65,7 @@ LIBS += libnn_cfg \ lib_demo \ libnn_nwm \ libnn_friends \ - libnn_nim \ + libnn_nim_2_x \ INSTALL_SDK_TOOL = true diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/OMakefile b/trunk/ConsoleDataMigration/ConsoleRestore/OMakefile index 90b2103..7a6ed08 100644 --- a/trunk/ConsoleDataMigration/ConsoleRestore/OMakefile +++ b/trunk/ConsoleDataMigration/ConsoleRestore/OMakefile @@ -70,7 +70,7 @@ LIBS += libnn_cfg \ libnn_friends \ libnn_ns \ libnn_am \ - libnn_nim \ + libnn_nim_2_x \ INSTALL_SDK_TOOL = true diff --git a/trunk/ConsoleDataMigration/Readme.txt b/trunk/ConsoleDataMigration/Readme.txt index 2f2f0d5..f8042ce 100644 --- a/trunk/ConsoleDataMigration/Readme.txt +++ b/trunk/ConsoleDataMigration/Readme.txt @@ -4,7 +4,9 @@ Horizon 0_14 branch r33437 + Horizon trunk r33597のcfgライブラリの変更をマージ + Horizon 1_0 branch r33839のRepairTool.descをマージ + + libraries ディレクトリにあるnimのライブラリを + $HORIZON_ROOT/libraries/CTR-TS.Process.MPCore/ 以下にコピー ・cygwin -・svnversion +・subversion diff --git a/trunk/ConsoleDataMigration/libraries/release/libnn_nim_2_x.fast.a b/trunk/ConsoleDataMigration/libraries/release/libnn_nim_2_x.fast.a new file mode 100644 index 0000000..97fb544 Binary files /dev/null and b/trunk/ConsoleDataMigration/libraries/release/libnn_nim_2_x.fast.a differ diff --git a/trunk/ConsoleDataMigration/libraries/release/libnn_nim_2_x.small.a b/trunk/ConsoleDataMigration/libraries/release/libnn_nim_2_x.small.a new file mode 100644 index 0000000..bda1378 Binary files /dev/null and b/trunk/ConsoleDataMigration/libraries/release/libnn_nim_2_x.small.a differ diff --git a/trunk/ConsoleDataMigration/libraries/verbose/libnn_nim_2_x.fast.a b/trunk/ConsoleDataMigration/libraries/verbose/libnn_nim_2_x.fast.a new file mode 100644 index 0000000..b111d07 Binary files /dev/null and b/trunk/ConsoleDataMigration/libraries/verbose/libnn_nim_2_x.fast.a differ diff --git a/trunk/ConsoleDataMigration/libraries/verbose/libnn_nim_2_x.small.a b/trunk/ConsoleDataMigration/libraries/verbose/libnn_nim_2_x.small.a new file mode 100644 index 0000000..036d5f5 Binary files /dev/null and b/trunk/ConsoleDataMigration/libraries/verbose/libnn_nim_2_x.small.a differ