Fix compilation issues
This commit is contained in:
		
							
								
								
									
										24
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										24
									
								
								Makefile
									
									
									
									
									
								
							| @@ -17,25 +17,33 @@ LDFLAGS+=-lxml2 | ||||
|  | ||||
| CXX=$(HOST)g++ | ||||
|  | ||||
| MOC_HEADERS=$(shell find src/view -name '*.hpp' -type f | tr '\n' ' ') | ||||
| SOURCES=$(shell find src -name '*.cpp' -type f | tr '\n' ' ') | ||||
| MOCS=$(MOC_HEADERS:.hpp=.moc) | ||||
| OBJS=$(SOURCES:.cpp=.o) | ||||
| MOC_HEADERS=$(shell find src/view -name '*.hpp' -type f | tr '\n' ' ') | ||||
| MOCS=$(MOC_HEADERS:.hpp=.objs) | ||||
| MOCS_OBJS=$(MOC_HEADERS:.hpp=.moc) | ||||
|  | ||||
| all: kc | ||||
| all: mojito kc | ||||
|  | ||||
| clean: | ||||
| 	find src -type f -name '*.[o~]' -exec rm -f \{\} \; | ||||
| 	find src -type f -name '*.moc' -exec rm -f \{\} \; | ||||
| 	find src -type f -name '*.objs' -exec rm -f \{\} \; | ||||
| 	rm -f kc | ||||
|  | ||||
| %.o : $(MOCS) $(SOURCES) | ||||
| 	$(CXX) $(CXXFLAGS) -c $< | ||||
| %.o : %.cpp | ||||
| 	$(CXX) $(CXXFLAGS) -c $< -o $@ | ||||
|  | ||||
| %.moc : src/view/%.hpp | ||||
| 	moc -nw $^ -o $< | ||||
| %.objs : %.moc | ||||
| 	$(CXX) $(CXXFLAGS) -x c++ $< -c -o $@ | ||||
|  | ||||
| kc: $(OBJS) | ||||
| %.moc : %.hpp | ||||
| 	moc -nw $< -o $@ | ||||
|  | ||||
| mojito : $(MOCS_OBJS) | ||||
|  | ||||
|  | ||||
| kc: $(MOCS) $(OBJS) | ||||
| 	$(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) | ||||
|  | ||||
| generate_locales: | ||||
|   | ||||
		Reference in New Issue
	
	Block a user