patch-rocview_makefile 978 B

123456789101112131415161718192021222324
  1. $OpenBSD: patch-rocview_makefile,v 1.1 2017/05/07 23:57:16 espie Exp $
  2. Index: rocview/makefile
  3. --- rocview/makefile.orig
  4. +++ rocview/makefile
  5. @@ -104,13 +104,13 @@ DEBUG=-g
  6. DESTDIR=$(FS)opt$(FS)rocrail
  7. BINDIR=..$(FS)rocs$(FS)bin
  8. -CPP=$(TOOLPREFIX)c++
  9. -CC=$(TOOLPREFIX)gcc
  10. +CPP=$(TOOLPREFIX)$(CXX)
  11. +CC=$(TOOLPREFIX)$(CC)
  12. LNK=$(TOOLPREFIX)$(LINKTOOL)
  13. INCL_PATH=$(MOUNTPOINT)
  14. -CC_FLAGS=-c $(CC_EXTRA_FLAGS) $(DEBUG) -I$(INCL_PATH) -I$(GENDIR)
  15. +CC_FLAGS=-c $(CC_EXTRA_FLAGS) $(CFLAGS) $(DEBUG) -I$(INCL_PATH) -I$(GENDIR)
  16. -CC_WXFLAGS=-c $(CC_EXTRA_FLAGS) $(DEBUG) $(WX_FLAGS) $(WX_INCL) -I$(INCL_PATH) -I$(GENDIR)
  17. +CC_WXFLAGS=-c $(CC_EXTRA_FLAGS) $(CFLAGS) $(DEBUG) $(WX_FLAGS) $(WX_INCL) -I$(INCL_PATH) -I$(GENDIR)
  18. RRLIBS=$(OUTDIR)$(FS)librocrail.a $(OUTDIR)$(FS)libwrapper.a $(OUTDIR)$(FS)librocs.a
  19. SRCS=impl$(FS)guiapp.cpp impl$(FS)item.cpp impl$(FS)locdlg.cpp impl$(FS)planpanel.cpp impl$(FS)propdlg.cpp impl$(FS)swdlg.cpp impl$(FS)streetdlg.cpp impl$(FS)bktext.cpp