Compiling:Makefiles - Revision history

Drezil: /* Multimapping - Diff/Merge on maps */

2012-01-10T11:57:27Z

‎Multimapping - Diff/Merge on maps

Drezil: /* Compiling Maps */

2012-01-10T11:55:09Z

‎Compiling Maps

Drezil: /* Compiling Maps */

2012-01-10T11:49:14Z

‎Compiling Maps

Drezil at 11:48, 10 January 2012

2012-01-10T11:48:39Z

Drezil: /* Linking Resources */

2012-01-10T11:47:43Z

‎Linking Resources

Drezil: /* Linking Resources */

2012-01-10T11:46:55Z

‎Linking Resources

Drezil: /* Linking Resources */

2012-01-10T11:46:26Z

‎Linking Resources

Drezil: /* Configuration */

2012-01-10T11:41:59Z

‎Configuration

Drezil: /* Dependencies */

2012-01-10T11:38:16Z

‎Dependencies

Drezil at 11:37, 10 January 2012

2012-01-10T11:37:50Z

Show changes

@@ Line 260: / Line 260: @@
   make merge
-and both changes are merged. Conflicts get resolved and a new base is born. This base gets delivered to the other mapper via
+and both changes are merged (a backup with the current timestamp is created before merging in case something goes horribly wrong). Conflicts get resolved and a new base is born. This base gets delivered to the other mapper via
   make newbase

← Older revision		Revision as of 11:55, 10 January 2012
Line 231:		Line 231:

	stuff labled with multimapping is explained below.		stuff labled with multimapping is explained below.
		+
		+	=== Examples ===
		+	Lets say you have your map and want to test it.
		+	make light surface pk3 install test
		+	compiles your map (with surface-sounds), packs it and starts urt for testing.
		+	After you tested the map you want to show it off to the "public" on your private, passwordprotected server.
		+	make deploy testserver
		+	Make recognizes that the map has not changed, thus all files are up2date and just uploads your version to the server, reloads the server via rcon and connects on it with the password given in the makefile.
		+	This way you can rapid-test your map with many people easily. You could also combine it and compile a
		+	make light surface pk3 install deploy
		+	over night and as soon as its finished everyone on the server gets the new version (if auto-download is set up correctly). They can already test it while you are still sleeping/at work/busy elsewhere and you get test-reports as soon as possible (if you depend on them).
		+	You can also shortcut your urt-launch with a
		+	make testserver
		+	so you dont have to select your map and everything.

	== Multimapping - Diff/Merge on maps ==		== Multimapping - Diff/Merge on maps ==

@@ Line 210: / Line 210: @@
   make light pk3 install test
-to build a pk3-file with light, pack it, link it in your system (linking doubled dont hurt) and start urt after compiling/packing. You can add/remove options as you like - they are executed in the order they are given. The given makefile includes:
+to build a pk3-file with light, pack it, link it in your system (linking doubled dont hurt) and start urt after compiling/packing with the map automatically loaded. You can add/remove options as you like - they are executed in the order they are given. The given makefile includes:
   bsp (just build bsp)

@@ Line 204: / Line 204: @@
 as seen there are also resources linked that are needed in many maps (skys, models, camera (mirrors etc.), trees, ...) but they are only present one time on your harddist and upon change you change them in EVERY single project in one go.
-== Compiling ==
+== Compiling Maps ==
 If everything is set up correctly you just go to your map-folder and enter

@@ Line 202: / Line 202: @@
   lrwxrwxrwx 1 sdressel sdressel   42 2011-11-05 18:01 ikarus_terrain -> /home/quake3/q3ut4/textures/ikarus_terrain
   lrwxrwxrwx 1 sdressel sdressel   41 2011-11-05 18:01 ikarus_walls -> /home/quake3/q3ut4/textures/ikarus_walls/
-as seen there are also resources linked that are needed in many maps (skys, models, camera (mirrors etc.), trees, ...) but they are only present one time on your harddist and upon change you change them in EVERYONE of your projects.
+as seen there are also resources linked that are needed in many maps (skys, models, camera (mirrors etc.), trees, ...) but they are only present one time on your harddist and upon change you change them in EVERY single project in one go.
 == Compiling ==

@@ Line 179: / Line 179: @@
   lrwxrwxrwx 1 sdressel sdressel   49 2011-11-05 18:01 ikarus_fountain.shader -> /home/quake3/q3ut4/scripts/ikarus_fountain.shader
   lrwxrwxrwx 1 sdressel sdressel   40 2011-11-05 18:01 ikarus.shader -> /home/quake3/q3ut4/scripts/ikarus.shader
   sound:

@@ Line 140: / Line 140: @@
   cd distrib/scripts/
   ln -s /home/quake3/q3ut4/scripts/uptown.shader uptown.shader
 == Compiling ==

@@ Line 27: / Line 27: @@
   # Map version
   MAP_VER           = _dev
- >> leave this.
+leave this.
   # Paths
   #Editor directory for saving maps
   ED_MAPDIR         = ~/.q3a/q3ut4/maps/
- >> where the *.map-files are stored - in doubt leave it.
+where the *.map-files are stored - in doubt leave it.
   #Where to install maps
   INSTALLDIR        = ~/.q3a/q3ut4/
- >> where the *.pk3-files are stored - in doubt leave it.
+where the *.pk3-files are stored - in doubt leave it.
   # Const variables - no need to change this
   PROJECT           = $(shell basename `pwd`)
   LOCATION          = $(shell pwd)/
@@ Line 47: / Line 46: @@
   PK3DIR            = pk3/
   CONFDIR           = conf/
+really: don't change!
   # Compiler base flags
   MC                = /home/juser/netradiant/install/q3map2.x86
- >> your q3map2-binary
+your q3map2-binary
   MC_FLAGS          = -game quake3 -threads 8
- >> threads # should match your cpu-cores
+threads # should match your cpu-cores
   MC_FS_FLAGS       = -fs_game q3ut4 -fs_basepath /home/quake3
- >> fs_basepath is the path taken for textures etc. pp.
+fs_basepath is the path taken for textures etc. pp.
- >> if you are going to follow the tutorial, leave it so.
+if you are going to follow the tutorial, leave it so.
   # Stage specific flags
@@ Line 61: / Line 61: @@
   include conf/vis.conf
   include conf/light.conf
- >> configs .. can be changed to i.e. dlight.conf for debug (=dirty) light etc.
+configs .. can be changed to i.e. dlight.conf for debug (=dirty) light etc.
   # pk3 related
@@ Line 67: / Line 67: @@
   #dirs to include in pk3, if they exist
   DIST_INCLUDE      = maps/* scripts/* textures/* sound/* models/* icons/* env/*
- >> don't change.
+don't change.
   # deploy
   DEPLOY_SERVER     = myserver.example.com
   DEPLOY_USER       = username
   DEPLOY_PASS       = password
   DEPLOY_DIR        = /
- >> if using NuLL's diff/merge-mapping-tool you need to setup this. normally not needed.
+for automatic uploading to an ftp-server. should be self-explaining.
   DUSER             = diff-username (e.g. Drezil)
   DOTHER            = diff-other_user (e.g. apath0)
+if using NuLL's diff/merge-mapping-tool you need to setup this. normally not needed.
   # rcon-stuff
   RCON_SERVER       = myurtserver.example.com
   RCON_PORT         = 27960
   RCON_PASSWORD     = rconpassword
   SERVER_PASSWORD   = private_password
   # local urt
   URT_BINARY        = /home/juser/UrbanTerror/ioq3-urt
 Everything after that should not be needed to change.

@@ Line 11: / Line 11: @@
 === Dependencies ===
-This Makefile uses some other Tools (mostly available in your distributions repository), namely:
+This Makefile uses some other tools (mostly available in your distributions repository), namely:
 * wput (for uploading)