Remove emebedded_pak.c entirely from Git, regenerate it properly

Author: vsonnier

.gitignore

@@ -6,6 +6,7 @@ Quake/*.d
 Quake/id1/
 Quake/vkquake
 Quake/vkquake.pak
+Quake/embedded_pak.c
 Quake/*.exe
 Quake/*.res
 Windows/VisualStudio/Id1

Misc/vq_pak/Makefile

@@ -19,4 +19,7 @@ bintoc: ../../Shaders/bintoc.c
 .PHONY: clean
 clean:
 	rm -f mkpak
+	rm -f mkpak.exe
 	rm -f ../../Shaders/bintoc
+	rm -f ../../Quake/vkquake.pak
+	rm -f ../../Quake/embedded_pak.c

Quake/Makefile

@@ -101,7 +101,7 @@ debug:
 
 clean:
 	make -C ../Misc/vq_pak clean
-	$(RM) *.o *.d $(DEFAULT_TARGET) vkquake.pak $(BINTOC_EXE) \
+	$(RM) *.o *.d $(DEFAULT_TARGET) \
 	../Shaders/Compiled/$(GLSLANG_OUT_FOLDER)/*.c \
 	../Shaders/Compiled/$(GLSLANG_OUT_FOLDER)/*.spv \
 	../Shaders/Compiled/$(GLSLANG_OUT_FOLDER)/*.d

Quake/Makefile.w64

@@ -99,8 +99,7 @@ debug:
 
 clean:
 	make -C ../Misc/vq_pak clean
-	$(RM) *.o *.d *.res *.dll vkquake.pak $(DEFAULT_TARGET) \
-	$(BINTOC_EXE) \
+	$(RM) *.o *.d *.res *.dll $(DEFAULT_TARGET) \
 	../Shaders/Compiled/$(GLSLANG_OUT_FOLDER)/*.c \
 	../Shaders/Compiled/$(GLSLANG_OUT_FOLDER)/*.spv \
 	../Shaders/Compiled/$(GLSLANG_OUT_FOLDER)/*.d

Quake/common.make

@@ -239,7 +239,6 @@ OBJS := strlcat.o \
 	$(SYSOBJ_SYS) $(SYSOBJ_MAIN)
 
 $(BINTOC_EXE): ../Shaders/bintoc.c
-	make -C ../Misc/vq_pak clean
 	make -B -C ../Misc/vq_pak
 
 .SECONDARY:
@@ -273,6 +272,12 @@ $(BINTOC_EXE): ../Shaders/bintoc.c
 %.o: %.c
 	$(CC) $(DFLAGS) -c $(CFLAGS) $(SDL_CFLAGS) -o $@ $<
 
+#embedded_pak.c is generated by bintoc
+embedded_pak.c: $(BINTOC_EXE)
+ 	
+embedded_pak.o:  embedded_pak.c
+	$(CC) $(DFLAGS) -c $(CFLAGS) -o $@ $<
+
 sinclude $(OBJS:.o=.d)
 sinclude $(SHADER_OBJS:%.o=../Shaders/Compiled/$(GLSLANG_OUT_FOLDER)/%.d)
 

Quake/embedded_pak.c

@@ -68,7 +68,7 @@ endif
 
 bintoc_command = [bintoc, '@PLAINNAME@.spv', '@PLAINNAME@_spv', '@OUTPUT@']
 
-vkquake_pak_path = join_paths(meson.project_source_root(), 'Quake', 'vkquake.pak')
+vkquake_pak_path = join_paths('@OUTPUT@', 'vkquake.pak')
 
 vq_pak_path = join_paths(meson.project_source_root(), 'Misc', 'vq_pak')
 mkpak_toc_file = join_paths(vq_pak_path, 'vq_pak_contents.txt')
@@ -79,9 +79,11 @@ run_mkpak = custom_target('run-mkpak',
   output : 'vkquake.pak',
   command: mkpak_command)
 
-embedded_pak_path = join_paths(meson.project_source_root(), 'Quake', 'embedded_pak.c')
+# Write the embedded pak into the build output (@OUTPUT@) so Meson can track it.
+# this as no special dependencies, so actually can generated anywhere
+embedded_pak_path = join_paths('@OUTPUT@', 'embedded_pak.c')
 
-bintoc_compress_command = [bintoc, '-c', vkquake_pak_path,'vkquake.pak', embedded_pak_path]
+bintoc_compress_command = [bintoc, '-c', vkquake_pak_path, 'vkquake.pak', embedded_pak_path]
 
 run_generate_embedded_pak = custom_target('run-embed_vkquake_pak',
 							output : 'embedded_pak.c',
@@ -180,7 +182,7 @@ srcs = [
     'Quake/wad.c',
     'Quake/world.c',
 	'Quake/hash_map.c',
-	'Quake/embedded_pak.c',
+	 run_generate_embedded_pak,
 ]
 
 cflags = ['-Wall', '-Wno-trigraphs', '-Werror', '-std=gnu11']