[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-1296-g52937654

[darcagn <da...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "A pseudo Operating System for the Dreamcast.".

The branch, master has been updated
       via  529376543f707ebb285164105a7f5d2a89b134d8 (commit)
       via  ccddc34c4e142f75aaba84db3389a0b4c27c4cb5 (commit)
       via  fc7d7f47f46d99c0543a85a5dbb136619aee8098 (commit)
      from  a6ac69842f75a75a1e16c481dd76d17186f8f477 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 529376543f707ebb285164105a7f5d2a89b134d8
Merge: a6ac6984 ccddc34c
Author: darcagn <da...@pr...>
Date:   Sun Feb 4 16:44:30 2024 -0600

    Merge pull request #484 from maishuji/fix/fix-kos-add-romdisk-func-retrieving-kos-base-from-env
    
    Fix cmake function kos_add_romdisk not getting KOS_BASE from ENV

commit ccddc34c4e142f75aaba84db3389a0b4c27c4cb5
Merge: fc7d7f47 a6ac6984
Author: Falco Girgis <gyr...@gm...>
Date:   Sun Feb 4 23:30:50 2024 +0100

    Merge branch 'master' into fix/fix-kos-add-romdisk-func-retrieving-kos-base-from-env

commit fc7d7f47f46d99c0543a85a5dbb136619aee8098
Author: maishuji <605...@us...>
Date:   Sun Feb 4 19:54:59 2024 +0100

    Fix cmake function kos_add_romdisk not getting KOS_BASE from ENV

-----------------------------------------------------------------------

Summary of changes:
 utils/cmake/dreamcast.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/cmake/dreamcast.cmake b/utils/cmake/dreamcast.cmake
index f700cdf1..607ace5c 100644
--- a/utils/cmake/dreamcast.cmake
+++ b/utils/cmake/dreamcast.cmake
@@ -60,7 +60,7 @@ function(kos_add_romdisk target romdiskPath)
     add_custom_command(
         OUTPUT  ${obj}
         DEPENDS ${obj_tmp}
-        COMMAND ${CMAKE_C_COMPILER} -o ${obj} -r ${obj_tmp} -L${KOS_BASE}/lib/dreamcast -Wl,--whole-archive -lromdiskbase
+        COMMAND ${CMAKE_C_COMPILER} -o ${obj} -r ${obj_tmp} -L$ENV{KOS_BASE}/lib/dreamcast -Wl,--whole-archive -lromdiskbase
         COMMAND rm ${obj_tmp}
     )
 


hooks/post-receive
-- 
A pseudo Operating System for the Dreamcast.