refactor: extract the obj compiler to a common folder

TheFakeMontyOnTheRun · Nov 4, 2023 · 7917d80 · 7917d80
1 parent dd5b829
commit 7917d80
Show file tree

Hide file tree

Showing 16 changed files with 43 additions and 772 deletions.
diff --git a/.gitignore b/.gitignore
@@ -183,3 +183,13 @@ core/doxysite
 monty.mode1
 monty.pbxuser
 my_frontend/Xcode2/build
+tools/wobj-compiler/target/wobj-compiler-1.0-SNAPSHOT-jar-with-dependencies.jar
+tools/wobj-compiler/target/wobj-compiler-1.0-SNAPSHOT.jar
+tools/wobj-compiler/target/classes/pt/b13h/wavefrontcompiler/CompilerApp$1.class
+tools/wobj-compiler/target/classes/pt/b13h/wavefrontcompiler/CompilerApp.class
+tools/wobj-compiler/target/libs/gameutils-1.0-SNAPSHOT.jar
+tools/wobj-compiler/target/libs/liboldfart-1.0-SNAPSHOT.jar
+tools/wobj-compiler/target/libs/libstrip-1.0-SNAPSHOT.jar
+tools/wobj-compiler/target/maven-archiver/pom.properties
+tools/wobj-compiler/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+tools/wobj-compiler/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
diff --git a/ee_frontend/data/Makefile b/ee_frontend/data/Makefile
@@ -1,14 +1,20 @@
 .DEFAULT_GOAL := default
 
-packager:
-	rm -f base3d/packer
-	$(CXX) -std=c++14 -opacker packer.cpp
+PACKAGER=packer
 
-models:
-	ls src/*.obj  | xargs java -jar wobj-compiler/dist/wobj-compiler-1.0-SNAPSHOT-jar-with-dependencies.jar
+CRUNCHER=../../tools/wobj-compiler/target/wobj-compiler-1.0-SNAPSHOT-jar-with-dependencies.jar
 
-data:	packager
-	python3 ./check_textures.py
+$(CRUNCHER):
+	mvn -q -f ../../tools/wobj-compiler/pom.xml clean compile package install
+
+$(PACKAGER):
+	rm -f $(PACKAGER)
+	$(CXX) -std=c++14 -o$(PACKAGER) packer.cpp
+
+models: $(CRUNCHER)
+	ls src/*.obj  | xargs java -jar ../../tools/wobj-compiler/target/wobj-compiler-1.0-SNAPSHOT-jar-with-dependencies.jar
+
+data:	$(PACKAGER)
 	rm -f ./base.pfs
 	ls assets/*.*  | xargs ./packer
 	mv ./data.pfs ../base.pfs

diff --git a/ee_frontend/data/wobj-compiler/dist/wobj-compiler-1.0-SNAPSHOT-jar-with-dependencies.jar b/ee_frontend/data/wobj-compiler/dist/wobj-compiler-1.0-SNAPSHOT-jar-with-dependencies.jar
diff --git a/gl_frontend/data/Makefile b/gl_frontend/data/Makefile
@@ -1,14 +1,20 @@
 .DEFAULT_GOAL := default
 
-packager:
-	rm -f base3d/packer
-	$(CXX) -std=c++14 -opacker packer.cpp
+PACKAGER=packer
 
-models:
-	ls src/*.obj  | xargs java -jar wobj-compiler/dist/wobj-compiler-1.0-SNAPSHOT-jar-with-dependencies.jar
+CRUNCHER=../../tools/wobj-compiler/target/wobj-compiler-1.0-SNAPSHOT-jar-with-dependencies.jar
 
-data:	packager
-	python3 ./check_textures.py
+$(CRUNCHER):
+	mvn -q -f ../../tools/wobj-compiler/pom.xml clean compile package install
+
+$(PACKAGER):
+	rm -f $(PACKAGER)
+	$(CXX) -std=c++14 -o$(PACKAGER) packer.cpp
+
+models: $(CRUNCHER)
+	ls src/*.obj  | xargs java -jar ../../tools/wobj-compiler/target/wobj-compiler-1.0-SNAPSHOT-jar-with-dependencies.jar
+
+data:	$(PACKAGER)
 	rm -f ./base.pfs
 	ls assets/*.*  | xargs ./packer
 	mv ./data.pfs ../base.pfs

diff --git a/gl_frontend/data/wobj-compiler/dist/wobj-compiler-1.0-SNAPSHOT-jar-with-dependencies.jar b/gl_frontend/data/wobj-compiler/dist/wobj-compiler-1.0-SNAPSHOT-jar-with-dependencies.jar
diff --git a/gl_frontend/data/wobj-compiler/pom.xml b/gl_frontend/data/wobj-compiler/pom.xml
diff --git a/gl_frontend/data/wobj-compiler/src/main/java/pt/b13h/wavefrontcompiler/CompilerApp.java b/gl_frontend/data/wobj-compiler/src/main/java/pt/b13h/wavefrontcompiler/CompilerApp.java
diff --git a/mx_frontend/data/Makefile b/mx_frontend/data/Makefile
@@ -1,21 +1,20 @@
 .DEFAULT_GOAL := default
 
-CRUNCHER=wobj-compiler/dist/wobj-compiler-1.0-SNAPSHOT-jar-with-dependencies.jar
 PACKAGER=packer
 
-$(CRUNCHER): 
-	mvn -q -f wobj-compiler/pom.xml clean compile package install
-	mkdir -p wobj-compiler/dist
-	cp wobj-compiler/target/wobj-compiler-1.0-SNAPSHOT-jar-with-dependencies.jar wobj-compiler/dist 
+CRUNCHER=../../tools/wobj-compiler/target/wobj-compiler-1.0-SNAPSHOT-jar-with-dependencies.jar
+
+$(CRUNCHER):
+	mvn -q -f ../../tools/wobj-compiler/pom.xml clean compile package install
 
 $(PACKAGER):
 	rm -f $(PACKAGER)
 	$(CXX) -std=c++14 -o$(PACKAGER) packer.cpp
 
-models:
-	ls src/*.obj  | xargs java -jar wobj-compiler/dist/wobj-compiler-1.0-SNAPSHOT-jar-with-dependencies.jar
+models: $(CRUNCHER)
+	ls src/*.obj  | xargs java -jar ../../tools/wobj-compiler/target/wobj-compiler-1.0-SNAPSHOT-jar-with-dependencies.jar
 
-data:	$(PACKAGER) $(CRUNCHER)
+data:	$(PACKAGER)
 	#python3 ./check_textures.py
 	rm -f ./base.pfs
 	ls assets/*.*  | xargs ./packer

diff --git a/mx_frontend/data/wobj-compiler/dist/wobj-compiler-1.0-SNAPSHOT-jar-with-dependencies.jar b/mx_frontend/data/wobj-compiler/dist/wobj-compiler-1.0-SNAPSHOT-jar-with-dependencies.jar