Commits

Anonymous committed 8a4e4ee

* fixed generation when there are multiple projects in a single directory
* changed include path of precompiled header
* fixed bad merge

Comments (0)

Files changed (2)

src/actions/make/_make.lua

 			end
 			
 			if searchprjs then
+				count = count + 1
 				for _, prj in ipairs(sln.projects) do
 					if prj.location == this.location then
 						count = count + 1

src/actions/make/make_cpp.lua

 		_p('ifneq (,$(PCH))')
 			_p('  -include $(OBJDIR)/$(notdir $(PCH)).d')
 		_p('endif')
-		_p('endif')
 	end
 
 
 			end
 
 			local gch = make.esc(path.getname(pchheader))
+			local pch = make.esc(project.getrelative(cfg.project, pchheader))
 			_p('  PCH        = %s', make.esc(project.getrelative(cfg.project, pchheader)))
 			_p('  GCH        = $(OBJDIR)/%s.gch', gch)
-			_p('  CPPFLAGS  += -I$(OBJDIR) -include $(OBJDIR)/%s', gch)
+			_p('  CPPFLAGS  += -I$(OBJDIR) -include %s', pch)
 		end
 	end