diff --git a/Makefile b/Makefile index 7e0426a..3939486 100755 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ DIRS = engine pinball editor brainstorm ETP = ./source/engine/thirdparty/ 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 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 += ./source/editor 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)) bsdirs != find ./source/brainstorm -type d @@ -143,11 +143,6 @@ pinball: $(ENGINE) $(pinobjects) @$(CC) $(pinobjects) $(LINK) -o $@ @mv pinball paladin/pinball -$(objprefix)/%.o:%.cpp - @mkdir -p $(@D) - @echo Making C++ object $@ - -@$(CC) $(COMPILER_FLAGS) - $(objprefix)/%.o:%.c @mkdir -p $(@D) @echo Making C object $@ diff --git a/source/pinball/editor.c b/source/pinball/editor.c new file mode 100644 index 0000000..e69de29 diff --git a/source/pinball/main.c b/source/pinball/main.c new file mode 100644 index 0000000..e69de29