mirror of
https://git.freebsd.org/ports.git
synced 2025-06-28 16:10:33 -04:00
57b23f591f
- changes the header include order so as not to pick up installed includes before local ones - suppresses the unneeded use of values.h - works around an inlining limitation in g++ PR: ports/81610 Submitted by: Jonathan Hanna <jhanna@shaw.ca> Approved by: David Yeske <dyeske@yahoo.com> (maintainer)
28 lines
1.1 KiB
Text
28 lines
1.1 KiB
Text
--- Makefile.orig Wed Jun 9 16:12:12 2004
|
|
+++ Makefile Wed Jun 9 16:13:39 2004
|
|
@@ -329,13 +329,13 @@
|
|
-$(DEL_CMD) OPCODE/*.obj OPCODE/*.o OPCODE/Ice/*.obj OPCODE/Ice/*.o
|
|
|
|
%$(OBJ): %.c
|
|
- $(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(DEFINES) $(C_OPT)1 $(C_OUT)$@ $<
|
|
+ $(CC) $(C_INC)$(INCPATH) $(C_FLAGS) $(DEFINES) $(C_OUT)$@ $<
|
|
|
|
%$(OBJ): %.cpp
|
|
- $(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(INC_OPCODE) $(DEFINES) $(C_OPT)$(OPT) $(C_OUT)$@ $<
|
|
+ $(CC) $(C_INC)$(INCPATH) $(C_FLAGS) $(INC_OPCODE) $(DEFINES) $(C_OUT)$@ $<
|
|
|
|
%.exe: %$(OBJ)
|
|
- $(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH)
|
|
+ $(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH) ${LDFLAGS}
|
|
|
|
|
|
# windows specific rules
|
|
@@ -357,7 +357,7 @@
|
|
|
|
# unix-gcc specific dependency making
|
|
|
|
-DEP_RULE=gcc -M $(C_INC)$(INCPATH) $(DEFINES)
|
|
+DEP_RULE=${CC} -M $(C_INC)$(INCPATH) $(DEFINES)
|
|
depend:
|
|
$(DEP_RULE) $(ODE_SRC) $(ODE_PREGEN_SRC) | tools/process_deps ode/src/ > Makefile.deps
|
|
$(DEP_RULE) $(DRAWSTUFF_SRC) | tools/process_deps drawstuff/src/ >> Makefile.deps
|