shithub: cstory

Info  •  Files  •  Log  •  Branches

Merge branch 'accurate' into portable

--- a/Makefile

+++ b/Makefile

@@ -125,7 +125,7 @@

 OBJECTS = $(addprefix obj/$(FILENAME)/, $(addsuffix .o, $(SOURCES)))

 DEPENDENCIES = $(addprefix obj/$(FILENAME)/, $(addsuffix .o.d, $(SOURCES)))

-OBJECTS += obj/$(FILENAME)/resources.o

+OBJECTS += obj/$(FILENAME)/windows_resources.o

 all: $(BUILD_DIRECTORY)/$(FILENAME) $(BUILD_DIRECTORY)/data $(BUILD_DIRECTORY)/$(DOCONFIG_FILENAME)

 	@echo Finished

@@ -147,7 +147,7 @@

 include $(wildcard $(DEPENDENCIES))

-obj/$(FILENAME)/resources.o: msvc2003/CSE2.rc

+obj/$(FILENAME)/windows_resources.o: msvc2003/CSE2.rc

 	@mkdir -p $(@D)

 	@$(WINDRES) $< $@

-- 

⑨