logo

overlay

My own overlay for experimentations, use with caution, no support is provided git clone https://hacktivis.me/git/overlay.git

libbulletml-0.0.6-Makefile.patch (3102B)

    

  1. --- a/Makefile
  2. +++ b/Makefile
  3. @@ -1,10 +1,5 @@
  4. -CC = g++
  5.  INCLUDES = -I.
  6.  LIBS = tinyxml/tinyxml.o tinyxml/tinyxmlparser.o tinyxml/tinyxmlerror.o
  7. -#CXXFLAGS = -g -W -Wall -ansi -pedantic
  8. -#CXXFLAGS = -pg -g -W -Wall -ansi -pedantic
  9. -CXXFLAGS = -O2 -W -Wall -ansi -pedantic
  10. -CFLAGS = -O2
  11.  OBJS = bulletmlparser-tinyxml.o bulletmlparser.o bulletmltree.o calc.o formula-variables.o bulletmlrunner.o bulletmlrunnerimpl.o
  12.  
  13.  all: libbulletml.a
  14. @@ -21,7 +16,7 @@
  15.  	bison -y   calc.yy && mv y.tab.c calc.cpp
  16.  
  17.  $(OBJS): %.o: %.cpp
  18. -	$(CC) -c $(CXXFLAGS) $(INCLUDES) $<
  19. +	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) -c $< -o $@
  20.  
  21.  doxy:
  22.  	doxygen
  23. --- a/tinyxml/Makefile
  24. +++ b/tinyxml/Makefile
  25. @@ -14,41 +14,6 @@
  26.  PROFILE        := NO
  27.  
  28.  #****************************************************************************
  29. -
  30. -CC     := gcc
  31. -CXX    := g++
  32. -LD     := g++
  33. -AR     := ar rc
  34. -RANLIB := ranlib
  35. -
  36. -DEBUG_CFLAGS     := -Wall -Wno-unknown-pragmas -Wno-format -g -DDEBUG
  37. -RELEASE_CFLAGS   := -Wall -Wno-unknown-pragmas -Wno-format -O2
  38. -
  39. -LIBS		 :=
  40. -
  41. -DEBUG_CXXFLAGS   := ${DEBUG_CFLAGS} 
  42. -RELEASE_CXXFLAGS := ${RELEASE_CFLAGS}
  43. -
  44. -DEBUG_LDFLAGS    := -g
  45. -RELEASE_LDFLAGS  :=
  46. -
  47. -ifeq (YES, ${DEBUG})
  48. -   CFLAGS       += ${DEBUG_CFLAGS}
  49. -   CXXFLAGS     += ${DEBUG_CXXFLAGS}
  50. -   LDFLAGS      += ${DEBUG_LDFLAGS}
  51. -else
  52. -   CFLAGS       += ${RELEASE_CFLAGS}
  53. -   CXXFLAGS     += ${RELEASE_CXXFLAGS}
  54. -   LDFLAGS      += ${RELEASE_LDFLAGS}
  55. -endif
  56. -
  57. -ifeq (YES, ${PROFILE})
  58. -   CFLAGS   := ${CFLAGS} -pg
  59. -   CXXFLAGS := ${CXXFLAGS} -pg
  60. -   LDFLAGS  := ${LDFLAGS} -pg
  61. -endif
  62. -
  63. -#****************************************************************************
  64.  # Preprocessor directives
  65.  #****************************************************************************
  66.  
  67. @@ -70,8 +35,8 @@
  68.  # Makefile code common to all platforms
  69.  #****************************************************************************
  70.  
  71. -CFLAGS   := ${CFLAGS}   ${DEFS}
  72. -CXXFLAGS := ${CXXFLAGS} ${DEFS}
  73. +CFLAGS   += ${DEFS}
  74. +CXXFLAGS += ${DEFS}
  75.  
  76.  #****************************************************************************
  77.  # Targets of the build
  78. @@ -98,7 +63,7 @@
  79.  #****************************************************************************
  80.  
  81.  ${OUTPUT}: ${OBJS}
  82. -	${LD} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} ${EXTRA_LIBS}
  83. +	${CXX} ${LDFLAGS} -o $@ ${OBJS} ${LIBS} ${EXTRA_LIBS}
  84.  
  85.  #****************************************************************************
  86.  # common rules
  87. @@ -106,10 +71,10 @@
  88.  
  89.  # Rules for compiling source files to object files
  90.  %.o : %.cpp
  91. -	${CXX} -c ${CXXFLAGS} ${INCS} $< -o $@
  92. +	${CXX} ${CXXFLAGS} ${CPPFLAGS} ${INCS} -c $< -o $@
  93.  
  94.  %.o : %.c
  95. -	${CC} -c ${CFLAGS} ${INCS} $< -o $@
  96. +	${CC} ${CFLAGS} ${CPPFLAGS} ${INCS} -c $< -o $@
  97.  
  98.  clean:
  99.  	-rm -f core ${OBJS} ${OUTPUT}
  100. --- a/ygg/Makefile
  101. +++ b/ygg/Makefile
  102. @@ -2,8 +2,6 @@
  103.  LIBS = 
  104.  #CXXFLAGS = -g -W -Wall
  105.  #CXXFLAGS = -pg -g -W -Wall
  106. -CXXFLAGS = -O2 -W -Wall
  107. -CFLAGS = -O2
  108.  OBJS = ygg.o
  109.  
  110.  all: $(OBJS)
  111. @@ -12,7 +10,7 @@
  112.  	rm -f *.o *.a
  113.  
  114.  $(OBJS): %.o: %.cpp
  115. -	$(CXX) -c $(CXXFLAGS) $(INCLUDES) $<
  116. +	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) -c $< -o $@
  117.  
  118.  distdir:
  119.