[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-1260-gc3be4a13

[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  c3be4a13e1585b1036987a36ba4d30dab7c608ac (commit)
       via  6b3c40e59f992e2dc84617da8542415611672796 (commit)
      from  21bd0321caafefd7c56daecc4dcfffdd41289de0 (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 c3be4a13e1585b1036987a36ba4d30dab7c608ac
Merge: 21bd0321 6b3c40e5
Author: darcagn <da...@pr...>
Date:   Mon Jan 15 01:12:54 2024 -0600

    Merge pull request #462 from KallistiOS/cmake_bugfix
    
    Fixed romdisks and bin2o in Cmake toolchain

commit 6b3c40e59f992e2dc84617da8542415611672796
Author: Falco Girgis <gyr...@gm...>
Date:   Mon Jan 15 01:05:01 2024 -0600

    Fixed romdisks and bin2o in Cmake toolchain
    
    - They were failing to compile for others, because I had tested with
      absolute paths, while others were expecting source-relative paths.
    - Changed input paths to be source-relative, changed intermediate
      output to be in the binary directory.

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

Summary of changes:
 utils/cmake/dreamcast.cmake | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/utils/cmake/dreamcast.cmake b/utils/cmake/dreamcast.cmake
index 97d8ffd1..f700cdf1 100644
--- a/utils/cmake/dreamcast.cmake
+++ b/utils/cmake/dreamcast.cmake
@@ -18,8 +18,8 @@ function(kos_bin2o inFile symbol)
 endfunction()
 
 function(kos_add_binary target inFile symbol)
-    set(outFile ${CMAKE_BINARY_DIR}/${symbol}.o)
-    kos_bin2o(${inFile} ${symbol} ${outFile})
+    set(outFile ${CMAKE_CURRENT_BINARY_DIR}/${symbol}.o)
+    kos_bin2o(${CMAKE_CURRENT_SOURCE_DIR}/${inFile} ${symbol} ${outFile})
     target_sources(${target} PRIVATE ${outFile})
 endfunction()
 
@@ -32,6 +32,8 @@ function(kos_add_romdisk target romdiskPath)
         set(romdiskName ${ARGN})
     endif()
 
+    set(romdiskPath ${CMAKE_CURRENT_SOURCE_DIR}/${romdiskPath})
+
     set(obj     ${CMAKE_CURRENT_BINARY_DIR}/${romdiskName}.o)
     set(obj_tmp ${CMAKE_CURRENT_BINARY_DIR}/${romdiskName}_tmp.o)
     set(img     ${CMAKE_CURRENT_BINARY_DIR}/${romdiskName}.img)


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