Finish OS X support in build_release script. Fix a name conflict in vgmplay on OS X. Call set_exe_str in vgmplay and stateview

3 files changed, 19 insertions, 9 deletions

diff --git a/build_release b/build_release
index b4af9f5..ceef42c 100755
--- a/build_release
+++ b/build_release
@@ -31,7 +31,11 @@ if [ $OS = "Windows" ]; then
 	cmd="wine blastem.exe"
 	txt=".txt"
 else
-	binaries="dis zdis stateview vgmplay blastem termhelper lib"
+	if [ $OS = "Darwin" ]; then
+		binaries="dis zdis stateview vgmplay blastem termhelper Frameworks"
+	else
+		binaries="dis zdis stateview vgmplay blastem termhelper lib"
+	fi
 	cmd="./blastem"
 	txt=""
 fi
@@ -51,7 +55,11 @@ cp -r $binaries shaders default.cfg rom.db "$dir"
 for file in README COPYING CHANGELOG; do
 	cp "$file" "$dir"/"$file$txt"
 done
-cp sdl/COPYING.txt "$dir"/SDL-LICENSE$txt
+if [ $OS = "Darwin" ]; then
+	cp SDL-LICENSE "$dir"
+else
+	cp sdl/COPYING.txt "$dir"/SDL-LICENSE$txt
+fi
 cp glew/LICENSE.txt "$dir"/GLEW-LICENSE$txt
 
 if [ $OS = "Windows" ]; then
diff --git a/stateview.c b/stateview.c
index 3f860e7..517d4c2 100644
--- a/stateview.c
+++ b/stateview.c
@@ -68,6 +68,7 @@ int main(int argc, char ** argv)
 	if (!state_file) {
 		fatal_error("Failed to open %s\n", argv[1]);
 	}
+	set_exe_str(argv[0]);
 	config = load_config(argv[0]);
 	int width = -1;
 	int height = -1;
diff --git a/vgmplay.c b/vgmplay.c
index 1bb5e2d..a66bb47 100644
--- a/vgmplay.c
+++ b/vgmplay.c
@@ -110,11 +110,11 @@ int headless = 0;
 #define MAX_SOUND_CYCLES 100000
 tern_node * config;
 
-void wait(ym2612_context * y_context, psg_context * p_context, uint32_t * current_cycle, uint32_t cycles)
+void vgm_wait(ym2612_context * y_context, psg_context * p_context, uint32_t * current_cycle, uint32_t cycles)
 {
 	while (cycles > MAX_SOUND_CYCLES)
 	{
-		wait(y_context, p_context, current_cycle, MAX_SOUND_CYCLES);
+		vgm_wait(y_context, p_context, current_cycle, MAX_SOUND_CYCLES);
 		cycles -= MAX_SOUND_CYCLES;
 	}
 	*current_cycle += cycles;
@@ -138,6 +138,7 @@ typedef struct {
 
 int main(int argc, char ** argv)
 {
+	set_exe_str(argv[0]);
 	data_block *blocks = NULL;
 	data_block *seek_block = NULL;
 	uint32_t seek_offset;
@@ -199,14 +200,14 @@ int main(int argc, char ** argv)
 			uint32_t wait_time = *(cur++);
 			wait_time |= *(cur++) << 8;
 			wait_time *= mclks_sample;
-			wait(&y_context, &p_context, &current_cycle, wait_time);
+			vgm_wait(&y_context, &p_context, &current_cycle, wait_time);
 			break;
 		}
 		case CMD_WAIT_60:
-			wait(&y_context, &p_context, &current_cycle, 735 * mclks_sample);
+			vgm_wait(&y_context, &p_context, &current_cycle, 735 * mclks_sample);
 			break;
 		case CMD_WAIT_50:
-			wait(&y_context, &p_context, &current_cycle, 882 * mclks_sample);
+			vgm_wait(&y_context, &p_context, &current_cycle, 882 * mclks_sample);
 			break;
 		case CMD_END:
 			if (header.loop_offset && --loop_count) {
@@ -265,7 +266,7 @@ int main(int argc, char ** argv)
 			if (cmd >= CMD_WAIT_SHORT && cmd < (CMD_WAIT_SHORT + 0x10)) {
 				uint32_t wait_time = (cmd & 0xF) + 1;
 				wait_time *= mclks_sample;
-				wait(&y_context, &p_context, &current_cycle, wait_time);
+				vgm_wait(&y_context, &p_context, &current_cycle, wait_time);
 			} else if (cmd >= CMD_YM2612_DAC && cmd < CMD_DAC_STREAM_SETUP) {
 				if (seek_block) {
 					ym_address_write_part1(&y_context, 0x2A);
@@ -282,7 +283,7 @@ int main(int argc, char ** argv)
 				if (wait_time)
 				{
 					wait_time *= mclks_sample;
-					wait(&y_context, &p_context, &current_cycle, wait_time);
+					vgm_wait(&y_context, &p_context, &current_cycle, wait_time);
 				}
 			} else {
 				fatal_error("unimplemented command: %X at offset %X\n", cmd, (unsigned int)(cur - data - 1));