john/prosperon
1
0
Fork 0
Code Issues Pull requests Actions Releases Activity

No more cpp

Browse source
This commit is contained in:
John Alanbrook 2022-06-22 20:20:29 +00:00
parent 7c611368be
commit 0ad3f792ee
3 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Makefile
View file

@ -24,7 +24,7 @@ DIRS = engine pinball editor brainstorm
ETP = ./source/engine/thirdparty/ ETP = ./source/engine/thirdparty/
define make_objs define make_objs
find $(1) -type f -name '*.c' -o -name '*.cpp' | sed 's|\.c.*|.o|' | sed 's|\.|$(objprefix)|1' find $(1) -type f -name '*.c' | sed 's|\.c.*|.o|' | sed 's|\.|$(objprefix)|1'
endef endef
define make_obj define make_obj
@ -60,7 +60,7 @@ eobjects != $(call rm,$(eobjects),sqlite pl_mpeg_extract_frames pl_mpeg_player y
eddirs != find ./source/editor -type d eddirs != find ./source/editor -type d
eddirs += ./source/editor eddirs += ./source/editor
edhead != $(call findindir,./source/editor,*.h) edhead != $(call findindir,./source/editor,*.h)
edobjects != find ./source/editor -maxdepth 1 -type f -name '*.c' -o -name '*.cpp' edobjects != find ./source/editor -maxdepth 1 -type f -name '*.c'
edobjects != $(call make_obj,$(edobjects)) edobjects != $(call make_obj,$(edobjects))
bsdirs != find ./source/brainstorm -type d bsdirs != find ./source/brainstorm -type d
@ -143,11 +143,6 @@ pinball: $(ENGINE) $(pinobjects)
@$(CC) $(pinobjects) $(LINK) -o $@ @$(CC) $(pinobjects) $(LINK) -o $@
@mv pinball paladin/pinball @mv pinball paladin/pinball
$(objprefix)/%.o:%.cpp
@mkdir -p $(@D)
@echo Making C++ object $@
-@$(CC) $(COMPILER_FLAGS)
$(objprefix)/%.o:%.c $(objprefix)/%.o:%.c
@mkdir -p $(@D) @mkdir -p $(@D)
@echo Making C object $@ @echo Making C object $@

0
source/pinball/editor.c Normal file
View file

0
source/pinball/main.c Normal file
View file