mirror-games/dca3-game
1
0
Fork 0
mirror of https://gitlab.com/skmp/dca3-game.git synced 2025-09-01 10:42:34 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix liberty and miami repacks, gitignore

Browse Source
This commit is contained in:
Stefanos Kornilios Mitsis Poiitidis
2025-03-09 14:37:37 +02:00
parent e616d3cd33
commit 43edb61c32
4 changed files with 48 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.gitignore vendored
View File

@@ -369,9 +369,8 @@ src/extras/GitSHA1.cpp
liberty/1ST_READ.BIN liberty/1ST_READ.BIN
liberty/IP.BIN liberty/IP.BIN
liberty/dca-liberty.cdi liberty/*.cdi
liberty/dca-liberty.iso liberty/*.iso
liberty/dca-liberty.ds.iso
liberty/dca-liberty.elf liberty/dca-liberty.elf
liberty/dca-liberty.elf.bin liberty/dca-liberty.elf.bin
liberty/dca-liberty-sim.elf liberty/dca-liberty-sim.elf
@@ -387,9 +386,8 @@ liberty/git-version
miami/1ST_READ.BIN miami/1ST_READ.BIN
miami/IP.BIN miami/IP.BIN
miami/dca-miami.cdi miami/*.cdi
miami/dca-miami.iso miami/*.iso
miami/dca-miami.ds.iso
miami/dca-miami.elf miami/dca-miami.elf
miami/dca-miami.elf.bin miami/dca-miami.elf.bin
miami/dca-miami-sim.elf miami/dca-miami-sim.elf
@@ -399,6 +397,7 @@ miami/extract-sfx*
miami/pack-sfx* miami/pack-sfx*
miami/analyze-profile* miami/analyze-profile*
miami/aud2adpcm* miami/aud2adpcm*
miami/adf2mp3*
miami/repack-data miami/repack-data
miami/output.map miami/output.map
miami/git-version miami/git-version

30
liberty/Makefile
View File

@@ -171,7 +171,7 @@ $(TARGET): $(OBJS)
run: $(TARGET) run: $(TARGET)
$(KOS_LOADER) $(TARGET) $(KOS_LOADER) $(TARGET)
$(REPACK_GTA_DIR)/GTA3SF8.b: GTA3SF8.b $(REPACK_GTA_DIR)/GTA3SF8.b: assets/GTA3SF8.b
mkdir -p $(@D) mkdir -p $(@D)
cp $< $@ cp $< $@
@@ -222,28 +222,28 @@ $(PROJECT_NAME)-prebuilt.iso: IP.BIN 1ST_READ_PREBUILT.BIN $(REPACK_DIR)/repacke
ifeq ($(HAVE_CDI4DC), yes) ifeq ($(HAVE_CDI4DC), yes)
$(PROJECT_NAME).cdi: $(PROJECT_NAME).iso $(PROJECT_NAME).cdi: $(PROJECT_NAME).iso
cdi4dc $(PROJECT_NAME).iso $(PROJECT_NAME).cdi > cdi.log cdi4dc $(PROJECT_NAME).iso $(PROJECT_NAME).cdi > cdi.log
@echo && echo && echo "*** CDI Baked Successfully ***" && echo && echo @echo && echo && echo "*** CDI Baked Successfully ($@) ***" && echo && echo
$(PROJECT_NAME)-no-repack.cdi: $(PROJECT_NAME)-no-repack.iso $(PROJECT_NAME)-no-repack.cdi: $(PROJECT_NAME)-no-repack.iso
cdi4dc $(PROJECT_NAME)-no-repack.iso $(PROJECT_NAME)-no-repack.cdi > cdi.log cdi4dc $(PROJECT_NAME)-no-repack.iso $(PROJECT_NAME)-no-repack.cdi > cdi.log
@echo && echo && echo "*** CDI Baked Successfully ***" && echo && echo @echo && echo && echo "*** CDI Baked Successfully ($@) ***" && echo && echo
$(PROJECT_NAME)-prebuilt.cdi: $(PROJECT_NAME)-prebuilt.iso $(PROJECT_NAME)-prebuilt.cdi: $(PROJECT_NAME)-prebuilt.iso
cdi4dc $(PROJECT_NAME).iso $(PROJECT_NAME).cdi > cdi.log cdi4dc $(PROJECT_NAME).iso $(PROJECT_NAME).cdi > cdi.log
rm 1ST_READ_PREBUILT.BIN rm 1ST_READ_PREBUILT.BIN
@echo && echo && echo "*** CDI Baked Successfully ***" && echo && echo @echo && echo && echo "*** CDI Baked Successfully ($@) ***" && echo && echo
else else
$(PROJECT_NAME).cdi: $(TARGET) $(REPACK_DIR)/repacked $(REPACK_GTA_DIR)/GTA3SF8.b $(PROJECT_NAME).cdi: $(TARGET) $(REPACK_DIR)/repacked $(REPACK_GTA_DIR)/GTA3SF8.b
mkdcdisc -e $(TARGET) -o $(PROJECT_NAME).cdi -d $(REPACK_GTA_DIR)/ $(MKDCDISC_PAD_OPTION) -n $(PROJECT_NAME) -a $(TEAM_NAME) -s $(DISC_SERIAL) -r $(RELEASE_DATE) mkdcdisc -e $(TARGET) -o $(PROJECT_NAME).cdi -d $(REPACK_GTA_DIR)/ $(MKDCDISC_PAD_OPTION) -n $(PROJECT_NAME) -a $(TEAM_NAME) -s $(DISC_SERIAL) -r $(RELEASE_DATE)
@echo && echo && echo "*** CDI Baked Successfully ***" && echo && echo @echo && echo && echo "*** CDI Baked Successfully ($@) ***" && echo && echo
$(PROJECT_NAME)-no-repack.cdi: $(TARGET) $(REPACK_GTA_DIR)/GTA3SF8.b $(PROJECT_NAME)-no-repack.cdi: $(TARGET) $(REPACK_GTA_DIR)/GTA3SF8.b
mkdcdisc -e $(TARGET) -o $(PROJECT_NAME)-no-repack.cdi -d $(REPACK_GTA_DIR)/ $(MKDCDISC_PAD_OPTION) -n $(PROJECT_NAME) -a $(TEAM_NAME) -s $(DISC_SERIAL) -r $(RELEASE_DATE) mkdcdisc -e $(TARGET) -o $(PROJECT_NAME)-no-repack.cdi -d $(REPACK_GTA_DIR)/ $(MKDCDISC_PAD_OPTION) -n $(PROJECT_NAME) -a $(TEAM_NAME) -s $(DISC_SERIAL) -r $(RELEASE_DATE)
@echo && echo && echo "*** CDI Baked Successfully ***" && echo && echo @echo && echo && echo "*** CDI Baked Successfully ($@) ***" && echo && echo
$(PROJECT_NAME)-prebuilt.cdi: $(REPACK_DIR)/repacked $(REPACK_GTA_DIR)/GTA3SF8.b $(PROJECT_NAME)-prebuilt.cdi: $(REPACK_DIR)/repacked $(REPACK_GTA_DIR)/GTA3SF8.b
mkdcdisc -e $(TARGET) -o $(PROJECT_NAME).cdi -d $(REPACK_GTA_DIR)/ $(MKDCDISC_PAD_OPTION) -n $(PROJECT_NAME) -a $(TEAM_NAME) -s $(DISC_SERIAL) -r $(RELEASE_DATE) mkdcdisc -e $(TARGET) -o $(PROJECT_NAME).cdi -d $(REPACK_GTA_DIR)/ $(MKDCDISC_PAD_OPTION) -n $(PROJECT_NAME) -a $(TEAM_NAME) -s $(DISC_SERIAL) -r $(RELEASE_DATE)
@echo && echo && echo "*** CDI Baked Successfully ***" && echo && echo @echo && echo && echo "*** CDI Baked Successfully ($@) ***" && echo && echo
endif endif
cdi: $(PROJECT_NAME).cdi cdi: $(PROJECT_NAME).cdi
@@ -269,16 +269,16 @@ gprof:
@echo "\033[42m Profiling data saved to $(TARGET)-kernel.png \033[0m" @echo "\033[42m Profiling data saved to $(TARGET)-kernel.png \033[0m"
# tools # tools
imgtool: imgtool.cpp imgtool: ../src/tools/imgtool.cpp
$(CXX) -std=c++17 -o $@ -Og $< $(CXX) -std=c++17 -o $@ -O0 -g $<
extract-sfx: extract-sfx.cpp extract-sfx: ../src/tools/extract-sfx.cpp
$(CXX) -std=c++17 -o $@ -Og $< $(CXX) -std=c++17 -o $@ -O0 -g $<
pack-sfx: pack-sfx.cpp pack-sfx: ../src/tools/pack-sfx.cpp
$(CXX) -std=c++17 -o $@ -Og $< $(CXX) -std=c++17 -o $@ -O0 -g $<
aud2adpcm: aud2adpcm.c aud2adpcm: ../src/tools/aud2adpcm.c
$(CC) -o $@ -O3 -g $< -I../vendor/minimp3 $(CC) -o $@ -O3 -g $< -I../vendor/minimp3
texconv: $(OBJS_TEXCONV) | pvrtex # You'll have to rebuild pvrtex manually if you change it texconv: $(OBJS_TEXCONV) | pvrtex # You'll have to rebuild pvrtex manually if you change it
@@ -381,7 +381,7 @@ $(REPACK_DIR)/repacked: $(REPACK_GTA_DIR)/models/gta3.img $(REPACK_GTA_DIR)/mode
mkdir -p $(@D) mkdir -p $(@D)
@git archive --format zip --output "$(REPACK_GTA_DIR)/DCA3-$(GIT_VERSION).zip" HEAD @git archive --format zip --output "$(REPACK_GTA_DIR)/DCA3-$(GIT_VERSION).zip" HEAD
@touch $@ @touch $@
@echo && echo && echo "*** Repack Completed Successfully ***" && echo && echo @echo && echo && echo "*** Repack Completed Successfully ($(PROJECT_NAME)) ***" && echo && echo
$(REPACK_DIR)/unpacked: imgtool $(GTA_DIR)/models/gta3.img $(GTA_DIR)/models/gta3.dir $(REPACK_DIR)/unpacked: imgtool $(GTA_DIR)/models/gta3.img $(GTA_DIR)/models/gta3.dir
mkdir -p $(@D) mkdir -p $(@D)

44
miami/Makefile
View File

@@ -174,9 +174,9 @@ $(TARGET): $(OBJS)
run: $(TARGET) run: $(TARGET)
$(KOS_LOADER) $(TARGET) $(KOS_LOADER) $(TARGET)
$(REPACK_GTA_DIR)/GTA3SF8.b: GTA3SF8.b # $(REPACK_GTA_DIR)/GTA3SF8.b: GTA3SF8.b
mkdir -p $(@D) # mkdir -p $(@D)
cp $< $@ # cp $< $@
1ST_READ.BIN: $(TARGET) 1ST_READ.BIN: $(TARGET)
rm -f $(TARGET).bin rm -f $(TARGET).bin
@@ -193,20 +193,20 @@ IP.BIN:
rm -f IP.BIN rm -f IP.BIN
$(KOS_BASE)/utils/makeip/makeip ip.txt IP.BIN $(KOS_BASE)/utils/makeip/makeip ip.txt IP.BIN
$(PROJECT_NAME).iso: IP.BIN 1ST_READ.BIN $(REPACK_DIR)/repacked $(REPACK_GTA_DIR)/GTA3SF8.b $(PROJECT_NAME).iso: IP.BIN 1ST_READ.BIN $(REPACK_DIR)/repacked # $(REPACK_GTA_DIR)/GTA3SF8.b
rm -f $(PROJECT_NAME).iso rm -f $(PROJECT_NAME).iso
rm -f $(REPACK_GTA_DIR)/1ST_READ.BIN rm -f $(REPACK_GTA_DIR)/1ST_READ.BIN
cp 1ST_READ.BIN $(REPACK_GTA_DIR) cp 1ST_READ.BIN $(REPACK_GTA_DIR)
mkisofs -C 0,11702 -V $(PROJECT_NAME) -G IP.BIN -r -J -l -o $(PROJECT_NAME).iso $(REPACK_GTA_DIR) mkisofs -C 0,11702 -V $(PROJECT_NAME) -G IP.BIN -r -J -l -o $(PROJECT_NAME).iso $(REPACK_GTA_DIR)
$(PROJECT_NAME)-no-repack.iso: IP.BIN 1ST_READ.BIN $(REPACK_GTA_DIR)/GTA3SF8.b $(PROJECT_NAME)-no-repack.iso: IP.BIN 1ST_READ.BIN # $(REPACK_GTA_DIR)/GTA3SF8.b
rm -f $(PROJECT_NAME)-no-repack.iso rm -f $(PROJECT_NAME)-no-repack.iso
rm -f $(REPACK_GTA_DIR)/1ST_READ.BIN rm -f $(REPACK_GTA_DIR)/1ST_READ.BIN
cp 1ST_READ.BIN $(REPACK_GTA_DIR) cp 1ST_READ.BIN $(REPACK_GTA_DIR)
mkisofs -C 0,11702 -V $(PROJECT_NAME) -G IP.BIN -r -J -l -o $(PROJECT_NAME)-no-repack.iso $(REPACK_GTA_DIR) mkisofs -C 0,11702 -V $(PROJECT_NAME) -G IP.BIN -r -J -l -o $(PROJECT_NAME)-no-repack.iso $(REPACK_GTA_DIR)
$(PROJECT_NAME).ds.iso: IP.BIN 1ST_READ.BIN $(REPACK_DIR)/repacked $(REPACK_GTA_DIR)/GTA3SF8.b $(PROJECT_NAME).ds.iso: IP.BIN 1ST_READ.BIN $(REPACK_DIR)/repacked # $(REPACK_GTA_DIR)/GTA3SF8.b
rm -f $(PROJECT_NAME).ds.iso rm -f $(PROJECT_NAME).ds.iso
rm -f $(REPACK_GTA_DIR)/1ST_READ.BIN rm -f $(REPACK_GTA_DIR)/1ST_READ.BIN
cp $(TARGET).bin $(REPACK_GTA_DIR)/1ST_READ.BIN cp $(TARGET).bin $(REPACK_GTA_DIR)/1ST_READ.BIN
@@ -217,7 +217,7 @@ $(PROJECT_NAME).ds.iso: IP.BIN 1ST_READ.BIN $(REPACK_DIR)/repacked $(REPACK_GTA_
$(KOS_BASE)/utils/scramble/scramble $(TARGET)-prebuilt.bin 1ST_READ_PREBUILT.BIN $(KOS_BASE)/utils/scramble/scramble $(TARGET)-prebuilt.bin 1ST_READ_PREBUILT.BIN
mkdir -p $(REPACK_GTA_DIR) mkdir -p $(REPACK_GTA_DIR)
$(PROJECT_NAME)-prebuilt.iso: IP.BIN 1ST_READ_PREBUILT.BIN $(REPACK_DIR)/repacked $(REPACK_GTA_DIR)/GTA3SF8.b $(PROJECT_NAME)-prebuilt.iso: IP.BIN 1ST_READ_PREBUILT.BIN $(REPACK_DIR)/repacked # $(REPACK_GTA_DIR)/GTA3SF8.b
rm -f $(REPACK_GTA_DIR)/1ST_READ.BIN rm -f $(REPACK_GTA_DIR)/1ST_READ.BIN
cp 1ST_READ_PREBUILT.BIN $(REPACK_GTA_DIR)/1ST_READ.BIN cp 1ST_READ_PREBUILT.BIN $(REPACK_GTA_DIR)/1ST_READ.BIN
mkisofs -C 0,11702 -V $(PROJECT_NAME) -G IP.BIN -r -J -l -o $(PROJECT_NAME).iso $(REPACK_GTA_DIR) mkisofs -C 0,11702 -V $(PROJECT_NAME) -G IP.BIN -r -J -l -o $(PROJECT_NAME).iso $(REPACK_GTA_DIR)
@@ -225,28 +225,28 @@ $(PROJECT_NAME)-prebuilt.iso: IP.BIN 1ST_READ_PREBUILT.BIN $(REPACK_DIR)/repacke
ifeq ($(HAVE_CDI4DC), yes) ifeq ($(HAVE_CDI4DC), yes)
$(PROJECT_NAME).cdi: $(PROJECT_NAME).iso $(PROJECT_NAME).cdi: $(PROJECT_NAME).iso
cdi4dc $(PROJECT_NAME).iso $(PROJECT_NAME).cdi > cdi.log cdi4dc $(PROJECT_NAME).iso $(PROJECT_NAME).cdi > cdi.log
@echo && echo && echo "*** CDI Baked Successfully ***" && echo && echo @echo && echo && echo "*** CDI Baked Successfully ($@) ***" && echo && echo
$(PROJECT_NAME)-no-repack.cdi: $(PROJECT_NAME)-no-repack.iso $(PROJECT_NAME)-no-repack.cdi: $(PROJECT_NAME)-no-repack.iso
cdi4dc $(PROJECT_NAME)-no-repack.iso $(PROJECT_NAME)-no-repack.cdi > cdi.log cdi4dc $(PROJECT_NAME)-no-repack.iso $(PROJECT_NAME)-no-repack.cdi > cdi.log
@echo && echo && echo "*** CDI Baked Successfully ***" && echo && echo @echo && echo && echo "*** CDI Baked Successfully ($@) ***" && echo && echo
$(PROJECT_NAME)-prebuilt.cdi: $(PROJECT_NAME)-prebuilt.iso $(PROJECT_NAME)-prebuilt.cdi: $(PROJECT_NAME)-prebuilt.iso
cdi4dc $(PROJECT_NAME).iso $(PROJECT_NAME).cdi > cdi.log cdi4dc $(PROJECT_NAME).iso $(PROJECT_NAME).cdi > cdi.log
rm 1ST_READ_PREBUILT.BIN rm 1ST_READ_PREBUILT.BIN
@echo && echo && echo "*** CDI Baked Successfully ***" && echo && echo @echo && echo && echo "*** CDI Baked Successfully ($@) ***" && echo && echo
else else
$(PROJECT_NAME).cdi: $(TARGET) $(REPACK_DIR)/repacked $(REPACK_GTA_DIR)/GTA3SF8.b $(PROJECT_NAME).cdi: $(TARGET) $(REPACK_DIR)/repacked # $(REPACK_GTA_DIR)/GTA3SF8.b
mkdcdisc -e $(TARGET) -o $(PROJECT_NAME).cdi -d $(REPACK_GTA_DIR)/ $(MKDCDISC_PAD_OPTION) -n $(PROJECT_NAME) -a $(TEAM_NAME) -s $(DISC_SERIAL) -r $(RELEASE_DATE) mkdcdisc -e $(TARGET) -o $(PROJECT_NAME).cdi -d $(REPACK_GTA_DIR)/ $(MKDCDISC_PAD_OPTION) -n $(PROJECT_NAME) -a $(TEAM_NAME) -s $(DISC_SERIAL) -r $(RELEASE_DATE)
@echo && echo && echo "*** CDI Baked Successfully ***" && echo && echo @echo && echo && echo "*** CDI Baked Successfully ($@) ***" && echo && echo
$(PROJECT_NAME)-no-repack.cdi: $(TARGET) $(REPACK_GTA_DIR)/GTA3SF8.b $(PROJECT_NAME)-no-repack.cdi: $(TARGET) # $(REPACK_GTA_DIR)/GTA3SF8.b
mkdcdisc -e $(TARGET) -o $(PROJECT_NAME)-no-repack.cdi -d $(REPACK_GTA_DIR)/ $(MKDCDISC_PAD_OPTION) -n $(PROJECT_NAME) -a $(TEAM_NAME) -s $(DISC_SERIAL) -r $(RELEASE_DATE) mkdcdisc -e $(TARGET) -o $(PROJECT_NAME)-no-repack.cdi -d $(REPACK_GTA_DIR)/ $(MKDCDISC_PAD_OPTION) -n $(PROJECT_NAME) -a $(TEAM_NAME) -s $(DISC_SERIAL) -r $(RELEASE_DATE)
@echo && echo && echo "*** CDI Baked Successfully ***" && echo && echo @echo && echo && echo "*** CDI Baked Successfully ($@) ***" && echo && echo
$(PROJECT_NAME)-prebuilt.cdi: $(REPACK_DIR)/repacked $(REPACK_GTA_DIR)/GTA3SF8.b $(PROJECT_NAME)-prebuilt.cdi: $(REPACK_DIR)/repacked # $(REPACK_GTA_DIR)/GTA3SF8.b
mkdcdisc -e $(TARGET) -o $(PROJECT_NAME).cdi -d $(REPACK_GTA_DIR)/ $(MKDCDISC_PAD_OPTION) -n $(PROJECT_NAME) -a $(TEAM_NAME) -s $(DISC_SERIAL) -r $(RELEASE_DATE) mkdcdisc -e $(TARGET) -o $(PROJECT_NAME).cdi -d $(REPACK_GTA_DIR)/ $(MKDCDISC_PAD_OPTION) -n $(PROJECT_NAME) -a $(TEAM_NAME) -s $(DISC_SERIAL) -r $(RELEASE_DATE)
@echo && echo && echo "*** CDI Baked Successfully ***" && echo && echo @echo && echo && echo "*** CDI Baked Successfully ($@) ***" && echo && echo
endif endif
cdi: $(PROJECT_NAME).cdi cdi: $(PROJECT_NAME).cdi
@@ -272,19 +272,19 @@ gprof:
@echo "\033[42m Profiling data saved to $(TARGET)-kernel.png \033[0m" @echo "\033[42m Profiling data saved to $(TARGET)-kernel.png \033[0m"
# tools # tools
imgtool: imgtool.cpp imgtool: ../src/tools/imgtool.cpp
$(CXX) -std=c++17 -o $@ -Og $< $(CXX) -std=c++17 -o $@ -Og $<
extract-sfx: extract-sfx.cpp extract-sfx: ../src/tools/extract-sfx.cpp
$(CXX) -std=c++17 -o $@ -Og $< $(CXX) -std=c++17 -o $@ -Og $<
pack-sfx: pack-sfx.cpp pack-sfx: ../src/tools/pack-sfx.cpp
$(CXX) -std=c++17 -o $@ -Og $< $(CXX) -std=c++17 -o $@ -Og $<
adf2mp3: adf2mp3.cpp adf2mp3: ../src/tools/adf2mp3.cpp
$(CXX) -o $@ -O3 -g $< $(CXX) -o $@ -O3 -g $<
aud2adpcm: aud2adpcm.c aud2adpcm: ../src/tools/aud2adpcm.c
$(CC) -o $@ -O3 -g $< -I../vendor/minimp3 $(CC) -o $@ -O3 -g $< -I../vendor/minimp3
texconv: $(OBJS_TEXCONV) | pvrtex # You'll have to rebuild pvrtex manually if you change it texconv: $(OBJS_TEXCONV) | pvrtex # You'll have to rebuild pvrtex manually if you change it
@@ -371,7 +371,7 @@ $(REPACK_DIR)/repacked: $(REPACK_GTA_DIR)/models/gta3.img $(REPACK_GTA_DIR)/mode
mkdir -p $(@D) mkdir -p $(@D)
@git archive --format zip --output "$(REPACK_GTA_DIR)/DCA3-$(GIT_VERSION).zip" HEAD @git archive --format zip --output "$(REPACK_GTA_DIR)/DCA3-$(GIT_VERSION).zip" HEAD
@touch $@ @touch $@
@echo && echo && echo "*** Repack Completed Successfully ***" && echo && echo @echo && echo && echo "*** Repack Completed Successfully ($(PROJECT_NAME)) ***" && echo && echo
$(REPACK_DIR)/unpacked: imgtool $(GTA_DIR)/models/gta3.img $(GTA_DIR)/models/gta3.dir $(REPACK_DIR)/unpacked: imgtool $(GTA_DIR)/models/gta3.img $(GTA_DIR)/models/gta3.dir
mkdir -p $(@D) mkdir -p $(@D)

8
src/tools/imgtool.cpp
View File

@@ -28,8 +28,12 @@ std::vector<DirRecord> readDirFile(const std::string& dirFilePath) {
DirRecord record; DirRecord record;
while (dirFile.read(reinterpret_cast<char*>(&record), sizeof(DirRecord))) { while (dirFile.read(reinterpret_cast<char*>(&record), sizeof(DirRecord))) {
assert(record.size != 0); // assert(record.size != 0); // plaster.dff is size zero on liberty
records.push_back(record); if (record.size > 0) {
records.push_back(record);
} else {
std::cerr << "Skipping record: " << record.name << " size is zero." << std::endl;
}
} }
return records; return records;