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 /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 'Makefile.in')
| -rw-r--r-- | Makefile.in | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/Makefile.in b/Makefile.in index 15ce3f3b..7dd84313 100644 --- a/Makefile.in +++ b/Makefile.in @@ -80,7 +80,7 @@ USE_PROJECTM_CWRAPPER = @USE_PROJECTM_CWRAPPER@ # Dependencies ################################################# -DEPS := $(USDX_TOOLS_DIR)/ResourceExtractor +DEPS := ifeq ($(USE_PROJECTM_CWRAPPER), yes) DEPS += $(PROJECTM_CWRAPPER_DIR) endif @@ -223,20 +223,23 @@ install-exec: .PHONY: install-data install-data: $(MAKE) RECURSIVE_SRC_DIR="artwork" \ - RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/artwork" \ - install-data-recursive + RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/artwork" \ + install-data-recursive $(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/languages" \ - RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/languages" \ - install-data-recursive + RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/languages" \ + install-data-recursive $(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/sounds" \ - RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/sounds" \ - install-data-recursive + RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/sounds" \ + install-data-recursive $(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/themes" \ - RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/themes" \ - install-data-recursive + RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/themes" \ + install-data-recursive + $(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/fonts" \ + RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/fonts" \ + install-data-recursive $(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/resources" \ - RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/resources" \ - install-data-recursive + RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/resources" \ + install-data-recursive $(INSTALL_DATA) "COPYING.txt" "$(DESTDIR)$(INSTALL_DATADIR)/COPYING.txt" .PHONY: install-data-recursive @@ -270,6 +273,7 @@ uninstall-data: $(RM_REC) "$(DESTDIR)$(INSTALL_DATADIR)/languages" $(RM_REC) "$(DESTDIR)$(INSTALL_DATADIR)/sounds" $(RM_REC) "$(DESTDIR)$(INSTALL_DATADIR)/themes" + $(RM_REC) "$(DESTDIR)$(INSTALL_DATADIR)/fonts" $(RM_REC) "$(DESTDIR)$(INSTALL_DATADIR)/resources" $(RM) "$(DESTDIR)$(INSTALL_DATADIR)/COPYING.txt" -rmdir "$(DESTDIR)$(INSTALL_DATADIR)" |