diff options
| author | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-09-12 09:51:33 +0000 |
|---|---|---|
| committer | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-09-12 09:51:33 +0000 |
| commit | abf47ddd1fe77287136535e2d05ada48b99b8e1f (patch) | |
| tree | c7bb68f38c381d1f84dd542de882cca079b9b4b2 /src/Makefile.in | |
| parent | b8e1a9b524f0922329c5307b0396f78a3dc2b44f (diff) | |
| download | usdx-abf47ddd1fe77287136535e2d05ada48b99b8e1f.tar.gz usdx-abf47ddd1fe77287136535e2d05ada48b99b8e1f.tar.xz usdx-abf47ddd1fe77287136535e2d05ada48b99b8e1f.zip | |
- Windows resources (.rc) reduced to the icon
- Texture resource names are now directly written to resources.inc
- Fonts are no resources anymore. They are moved to game/fonts and can be changed to support multiple charsets (until the TTF part is finished). Fonts are registered in fonts/fonts.in
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1367 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 33bf8fba..3d4b6def 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -52,17 +52,6 @@ USDX_LIB_DIR := $(USDX_SRC_DIR)/lib INSTALL_DATADIR := $(datadir)/$(USDX_PACKAGE_NAME) ################################################# -# RC -> resource.inc -################################################# - -# RC resource extraction config -RESEXTRACTOR_DIR := $(USDX_TOOLS_DIR)/ResourceExtractor -RESEXTRACTOR_BIN := $(RESEXTRACTOR_DIR)/ResourceExtractor$(EXEEXT) -RESOURCE_DIR := $(USDX_GAME_DIR)/resources -RESOURCE_FILE := $(srcdir)/resource.inc -RC_FILE := $(srcdir)/ultrastardx.rc - -################################################# # FPC config ################################################# @@ -230,7 +219,7 @@ create-pathinfo: echo "INSTALL_DATADIR = '$(INSTALL_DATADIR)';" > paths.inc # check if any src-file changed and rebuild -$(USDX_BIN): $(RESOURCE_FILE) $(USDX_PROJ) $(STATIC_LIBS) $(SRC_FILES) +$(USDX_BIN): $(USDX_PROJ) $(STATIC_LIBS) $(SRC_FILES) @echo "===================================" @echo "Changed files:" @echo "$?" @@ -247,25 +236,13 @@ $(USDX_BIN): $(RESOURCE_FILE) $(USDX_PROJ) $(STATIC_LIBS) $(SRC_FILES) $(PPC) $(strip $(PFLAGS_ALL)) -o$@ $(USDX_PROJ) ################################################# -# Resource-file -################################################# - -$(RESOURCE_FILE): $(RC_FILE) - $(RESEXTRACTOR_BIN) $(RC_FILE) $(RESOURCE_DIR) $(RESOURCE_FILE) - - -################################################# # clean-up ################################################# .PHONY: clean -clean: clean_obj clean_res +clean: clean_obj $(RM) paths.inc -.PHONY: clean_res -clean_res: - $(RM) "$(RESOURCE_FILE)" - .PHONY: clean_obj clean_obj: clean_bin $(RM_REC) "$(PCUNIT_DIR)" |