mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-27 20:41:46 +00:00
Merge assets/CMakeLists.txt
This commit is contained in:
parent
e62eb255f0
commit
536054b3f0
1 changed files with 0 additions and 6 deletions
|
|
@ -17,17 +17,11 @@ set(SRB2_ASSET_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/installer"
|
||||||
####################
|
####################
|
||||||
|
|
||||||
set(SRB2_ASSET_HASHED
|
set(SRB2_ASSET_HASHED
|
||||||
<<<<<<< HEAD
|
|
||||||
"main.kart;\
|
"main.kart;\
|
||||||
gfx.pk3;\
|
gfx.pk3;\
|
||||||
textures.pk3;\
|
textures.pk3;\
|
||||||
chars.pk3;\
|
chars.pk3;\
|
||||||
maps.pk3;\
|
maps.pk3;\
|
||||||
=======
|
|
||||||
"srb2.pk3;\
|
|
||||||
player.dta;\
|
|
||||||
zones.pk3;\
|
|
||||||
>>>>>>> srb2/next
|
|
||||||
patch.pk3"
|
patch.pk3"
|
||||||
CACHE STRING "Asset filenames to apply MD5 checks. No spaces between entries!"
|
CACHE STRING "Asset filenames to apply MD5 checks. No spaces between entries!"
|
||||||
)
|
)
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue