93 MESA_CFG_64= $(MESA_CFG_64_$(MACH)) |
93 MESA_CFG_64= $(MESA_CFG_64_$(MACH)) |
94 |
94 |
95 BUILD_32_FLAGS= MESA_CFG=$(MESA_CFG_32) |
95 BUILD_32_FLAGS= MESA_CFG=$(MESA_CFG_32) |
96 BUILD_64_FLAGS= MESA_CFG=$(MESA_CFG_64) |
96 BUILD_64_FLAGS= MESA_CFG=$(MESA_CFG_64) |
97 |
97 |
|
98 # Flags passed on make command line when building |
|
99 ADD_MAKE_FLAGS = X11_INCLUDES="-I$(PROTODIR)$(X11_INCLUDES_DIR)" \ |
|
100 LDFLAGS="$(PROG_LDFLAGS) -L$(PROTODIR)$(X11_DIR)/lib$(ARCHLIBSUBDIR)" |
|
101 |
98 # Build Mesa demos |
102 # Build Mesa demos |
99 $(GLXGEARS_BIN): $(UNPACK_TARGET) |
103 $(GLXGEARS_BIN): $(UNPACK_TARGET) |
100 (cd $(SOURCE_DIR)/configs && rm -f current && ln -s $(MESA_CFG) current) |
104 (cd $(SOURCE_DIR)/configs && rm -f current && ln -s $(MESA_CFG) current) |
101 (cd $(DEMOS_DIR) && $(MAKE) $(MFLAGS) LDFLAGS="$(PROG_LDFLAGS)" glxgears ) |
105 (cd $(DEMOS_DIR) && $(MAKE) $(MFLAGS) $(ADD_MAKE_FLAGS) glxgears ) |
102 |
106 |
103 $(GLXINFO_BIN): $(UNPACK_TARGET) |
107 $(GLXINFO_BIN): $(UNPACK_TARGET) |
104 (cd $(SOURCE_DIR)/configs && rm -f current && ln -s $(MESA_CFG) current) |
108 (cd $(SOURCE_DIR)/configs && rm -f current && ln -s $(MESA_CFG) current) |
105 (cd $(DEMOS_DIR) && $(MAKE) $(MFLAGS) LDFLAGS="$(PROG_LDFLAGS)" glxinfo ) |
109 (cd $(DEMOS_DIR) && $(MAKE) $(MFLAGS) $(ADD_MAKE_FLAGS) glxinfo ) |
106 |
110 |
107 # For testing - we don't ship the rest of these |
111 # For testing - we don't ship the rest of these |
108 all-xdemos_gen: $(UNPACK_TARGET) |
112 all-xdemos_gen: $(UNPACK_TARGET) |
109 (cd $(SOURCE_DIR)/configs && rm -f current && ln -s $(MESA_CFG) current) |
113 (cd $(SOURCE_DIR)/configs && rm -f current && ln -s $(MESA_CFG) current) |
110 (cd $(DEMOS_DIR) && $(MAKE) $(MFLAGS) LDFLAGS="$(PROG_LDFLAGS)") |
114 (cd $(DEMOS_DIR) && $(MAKE) $(MFLAGS) $(ADD_MAKE_FLAGS) ) |
111 |
115 |
112 all-xdemos: |
116 all-xdemos: |
113 $(MAKE) $(MFLAGS) BUILD_DIR=$(BUILD_DIR_32) ARCH_FLAGS="$(ARCH32_FLAGS)" $(BUILD_32_FLAGS) all-xdemos_gen |
117 $(MAKE) $(MFLAGS) BUILD_DIR=$(BUILD_DIR_32) ARCH_FLAGS="$(ARCH32_FLAGS)" $(BUILD_32_FLAGS) all-xdemos_gen |
114 |
118 |
115 install_gen:: $(INSTALL_TARGETS) |
119 install_gen:: $(INSTALL_TARGETS) |