Fixed example project

jkrueger · Feb 2, 2016 · 1bfbf8f · 1bfbf8f
1 parent 582bc01
commit 1bfbf8f
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 4 deletions.
diff --git a/examples/Makefile b/examples/Makefile
@@ -1,4 +1,7 @@
-include build/system.mk
+include build/core.mk
+
+CC  := clang
+CXX := clang++
 
 $(eval $(call SUBDIR, greetings))
 

diff --git a/examples/build b/examples/build
@@ -0,0 +1 @@
+..
diff --git a/examples/greetings/rules.mk → examples/greetings/build.mk b/examples/greetings/rules.mk → examples/greetings/build.mk
@@ -1,12 +1,14 @@
 include $(TOP)/build/header.mk
 
-targets_$(d)    := helloworld goodbyeworld
+products_$(d) := helloworld goodbyeworld
 
+helloworld_precompiled_header_$(d) := helloworld.hpp
 helloworld_sources_$(d)     := helloworld.cpp
 helloworld_target_dir_$(d)  := bin
 helloworld_cxx_flags_$(d)   := -O2
 helloworld_ld_flags_$(d)    := 
 
+goodbyeworld_precompiled_header_$(d) := goodbyeworld.hpp
 goodbyeworld_sources_$(d)   := goodbyeworld.cpp
 goodbyeworld_target_dir_$(d):= bin
 goodbyeworld_cxx_flags_$(d) := -g -O0

diff --git a/examples/greetings/goodbyeworld.cpp → examples/greetings/src/goodbyeworld.cpp b/examples/greetings/goodbyeworld.cpp → examples/greetings/src/goodbyeworld.cpp
diff --git a/examples/greetings/src/goodbyeworld.hpp b/examples/greetings/src/goodbyeworld.hpp
@@ -0,0 +1,2 @@
+// precompiled header for this project
+// empty for this example, but you could add arbitrary header files here
diff --git a/examples/greetings/helloworld.cpp → examples/greetings/src/helloworld.cpp b/examples/greetings/helloworld.cpp → examples/greetings/src/helloworld.cpp
diff --git a/examples/greetings/src/helloworld.hpp b/examples/greetings/src/helloworld.hpp
@@ -0,0 +1,2 @@
+// precompiled header for this project
+// empty for this example, but you could add arbitrary header files here
diff --git a/footer.mk b/footer.mk
@@ -8,7 +8,7 @@ define RECIPES
     $$(__t)_objects_$(d) := $$($$(__t)_objects_$(d):%.c=%.o)
     $$(__t)_objects_$(d) := $$($$(__t)_objects_$(d):%=$(BUILD_DIR)/$(d)/%)
     $$(__t)_deps_$(d)    := $$($$(__t)_sources_$(d):%.cpp=%.d)
-	$$(__t)_deps_$(d)    := $$($$(__t)_deps_$(d):%.c=%.d)
+		$$(__t)_deps_$(d)    := $$($$(__t)_deps_$(d):%.c=%.d)
     $$(__t)_deps_$(d)    += $$($$(__t)_precompiled_header_$(d):%.hpp=%.d)
     $$(__t)_deps_$(d)    := $$($$(__t)_deps_$(d):%=$(BUILD_DIR)/$(d)/%)
     __odir := $(BUILD_DIR)/$(d)
@@ -24,7 +24,7 @@ define RECIPES
     $$(__qtgt): ld_local_flags  := $$($$(__t)_ld_flags_$(d))
     $$(__odir)/%.hpp.pch: $(d)/src/%.hpp
 	$(PCH_RECIPE)
-    $$(__odir)/%.o: $(d)/src/%.cpp | $$(__odir) $$($$(__t)_pch_$(d))
+    $$(__odir)/%.o: $(d)/src/%.cpp | $$(__odir) $$(__odir)/%.hpp.pch
 	$(CXX_RECIPE)
     $$(__odir)/%.o: $(d)/src/%.c | $$(__odir)
 	$(C_RECIPE)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		// precompiled header for this project
		// empty for this example, but you could add arbitrary header files here