Fix Makefile for fresh checkout

ctreffs · Oct 28, 2019 · bb91b64 · bb91b64
1 parent d0810e5
commit bb91b64
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -15,19 +15,15 @@ test: genLinuxTests
 	swift test
 
 submodule:
-	git submodule init
-	git submodule update --recursive
+	git submodule update --init --recursive
 
-updateCLibImGui:
-	git submodule init $(imgui_src)
-	git submodule update --recursive $(imgui_src)
+updateCLibImGui: submodule
 
 copyLibImGui:
-	cp $(imgui_src)/imgui/*.h $(c_imgui2_src)/imgui
-	cp $(imgui_src)/imgui/*.cpp $(c_imgui2_src)/imgui
-	cp $(imgui_src)/generator/output/cimgui.h $(c_imgui2_src)/include
-	#cp $(imgui_src)/generator/output/cimgui_impl.h $(c_imgui2_src)
-	cp $(imgui_src)/generator/output/cimgui.cpp $(c_imgui2_src)
+	cp $(imgui_src)/imgui/*.h $(c_imgui_src)/imgui
+	cp $(imgui_src)/imgui/*.cpp $(c_imgui_src)/imgui
+	cp $(imgui_src)/generator/output/cimgui.h $(c_imgui_src)/include
+	cp $(imgui_src)/generator/output/cimgui.cpp $(c_imgui_src)
 
 generateCInterface:
 	cd $(imgui_src)/generator && luajit ./generator.lua gcc glfw opengl3 opengl2 sdl