trunk/makefile
| r242882 | r242883 | |
|---|
| 509 | 509 | |
| 510 | 510 | # CFLAGS is defined based on C or C++ targets |
| 511 | 511 | # (remember, expansion only happens when used, so doing it here is ok) |
| 512 | | CFLAGS = $(CCOMFLAGS) $(CPPONLYFLAGS) |
| 512 | CFLAGS = $(CCOMFLAGS) $(CPPONLYFLAGS) $(INCPATH) |
| 513 | 513 | |
| 514 | 514 | # we compile C-only to C89 standard with GNU extensions |
| 515 | 515 | # we compile C++ code to C++98 standard with GNU extensions |
| r242882 | r242883 | |
|---|
| 864 | 864 | include $(SRC)/regtests/regtests.mak |
| 865 | 865 | |
| 866 | 866 | # combine the various definitions to one |
| 867 | | CCOMFLAGS += $(INCPATH) |
| 868 | 867 | CDEFS = $(DEFS) |
| 869 | 868 | |
| 870 | 869 | # TODO: -x c++ should not be hard-coded |
| r242882 | r242883 | |
|---|
| 1020 | 1019 | ifeq ($(TARGETOS),macosx) |
| 1021 | 1020 | $(OBJ)/%.o: $(SRC)/%.m | $(OSPREBUILD) |
| 1022 | 1021 | @echo Objective-C compiling $<... |
| 1023 | | $(CC) $(CDEFS) $(COBJFLAGS) $(CCOMFLAGS) -c $< -o $@ |
| 1022 | $(CC) $(CDEFS) $(COBJFLAGS) $(CCOMFLAGS) $(INCPATH) -c $< -o $@ |
| 1024 | 1023 | endif |
| 1025 | 1024 | |
| 1026 | 1025 | |
trunk/src/lib/lib.mak
| r242882 | r242883 | |
|---|
| 480 | 480 | |
| 481 | 481 | $(LIBOBJ)/portmidi/%.o: $(3RDPARTY)/portmidi/%.c | $(OSPREBUILD) |
| 482 | 482 | @echo Compiling $<... |
| 483 | | $(CC) $(CDEFS) $(PMOPTS) $(CCOMFLAGS) $(CONLYFLAGS) -I$(3RDPARTY)/portmidi/pm_common -I$(3RDPARTY)/portmidi/porttime -c $< -o $@ |
| 483 | $(CC) $(CDEFS) $(PMOPTS) $(CCOMFLAGS) $(CONLYFLAGS) $(INCPATH) -I$(3RDPARTY)/portmidi/pm_common -I$(3RDPARTY)/portmidi/porttime -c $< -o $@ |
| 484 | 484 | |
| 485 | 485 | ifeq ($(TARGETOS),macosx) |
| 486 | 486 | $(LIBOBJ)/portmidi/%.o: $(3RDPARTY)/portmidi/%.m | $(OSPREBUILD) |
| 487 | 487 | @echo Objective-C compiling $<... |
| 488 | | $(CC) $(CDEFS) $(COBJFLAGS) $(CCOMFLAGS) -c $< -o $@ |
| 488 | $(CC) $(CDEFS) $(COBJFLAGS) $(CCOMFLAGS) $(INCPATH) -c $< -o $@ |
| 489 | 489 | endif |
| 490 | 490 | |
| 491 | 491 | #------------------------------------------------- |
| r242882 | r242883 | |
|---|
| 544 | 544 | |
| 545 | 545 | $(LIBOBJ)/lua/lsqlite3/%.o: $(3RDPARTY)/lsqlite3/%.c | $(OSPREBUILD) |
| 546 | 546 | @echo Compiling $<... |
| 547 | | $(CC) $(CDEFS) $(CCOMFLAGS) $(CONLYFLAGS) -DLUA_COMPAT_ALL $(LUA_FLAGS) -c $< -o $@ |
| 547 | $(CC) $(CDEFS) $(CCOMFLAGS) $(CONLYFLAGS) -DLUA_COMPAT_ALL -I$(3RDPARTY)/lua/src -I$(3RDPARTY) $(LUA_FLAGS) -c $< -o $@ |
| 548 | 548 | |
| 549 | 549 | #------------------------------------------------- |
| 550 | 550 | # web library objects |