Loading

Paste #pnzxnoeln

Wrap Raw Revise
  1. diff --git a/Makefile b/Makefile
  2. --- a/Makefile
  3. +++ b/Makefile
  4. @@ -7,41 +7,29 @@
  5.  
  6.  SHELL=/bin/bash
  7.  
  8. --include Makefile.config
  9. -
  10. -##################################################################
  11. -#
  12. -# For easy updates you can copy these basic definitions in
  13. -# Makefile.config
  14. -# and place that next to the Makefile. This will allow easy
  15. -# updates to the generic Makefile
  16. -#
  17.  ##################################################################
  18.  
  19. -# Definition of the grfs
  20. -REPO_NAME           ?= My NewGRF
  21. +REPO_NAME          := FIRS Industry Replacement Set
  22.  
  23. -# This is the filename part common to the grf file, main source file and the tar name
  24. -BASE_FILENAME       ?= mynewgrf
  25. +BASE_FILENAME      := firs
  26.  
  27. -# Documentation files
  28. -#DOC_FILES ?= docs/readme.txt docs/license.txt docs/changelog.txt
  29. +# Documentation files:
  30. +# DOC_FILES := docs/changelog.txt docs/readme.txt docs/license.txt
  31.  
  32. -# Directory structure
  33. -SCRIPT_DIR          ?= build-common
  34. +SCRIPT_DIR         := scripts
  35.  
  36. -# Uncomment in order to make use of gimp scripting. See the file
  37. -# for a description of the format
  38. -# GFX_SCRIPT_LIST_FILES      := gfx/png_source_list
  39. +# Offset of default branch (increase, if there is a new release branch)
  40. +REPO_BRANCH_VERSION := 0
  41.  
  42. -# If needed, declare the minimum NML requirements
  43. -# REQUIRED_NML_BRANCH  = 0.3
  44. -# MIN_NML_REVISION     = 0
  45. +# If everything is default, you don't need the rest:
  46.  
  47. -##################################################################
  48. -#
  49. -# Everything below here usually need not change for simple NewGRFs
  50. -#
  51. +NML_MIN_REVISION    := 2044
  52. +NML_MIN_VERSION     := 030
  53. +
  54. +# needed for using python 2 compile with python 3 nml
  55. +PYTHONPATH2=../../lib/python2.6/site-packages
  56. +PYTHON2=python2.7
  57. +
  58.  ##################################################################
  59.  
  60.  # Define the filenames of the grf and nml file. They must be in the main directoy
  61. diff --git a/Makefile.config b/Makefile.config
  62. deleted file mode 100644
  63. --- a/Makefile.config
  64. +++ /dev/null
  65. @@ -1,23 +0,0 @@
  66. -# This file defines the principal settings for this project
  67. -
  68. -REPO_NAME          := FIRS Industry Replacement Set
  69. -
  70. -BASE_FILENAME      := firs
  71. -
  72. -# Documentation files:
  73. -# DOC_FILES := docs/changelog.txt docs/readme.txt docs/license.txt
  74. -
  75. -# comment out those dirs which are not in use
  76. -SCRIPT_DIR         := scripts
  77. -
  78. -# Offset of default branch (increase, if there is a new release branch)
  79. -REPO_BRANCH_VERSION := 0
  80. -
  81. -# If everything is default, you don't need the rest:
  82. -
  83. -NML_MIN_REVISION    := 2044
  84. -NML_MIN_VERSION     := 030
  85. -
  86. -# needed for using python 2 compile with python 3 nml
  87. -PYTHONPATH2=../../lib/python2.6/site-packages
  88. -PYTHON2=python2.7
Posted by Anonymous at 25 Jan 2015, 08:23:09 UTC
Language: diff • Views: 906

Comments