diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-10-08 14:36:15 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-10-08 14:36:15 +0000 |
| commit | e77331a64ef2c7260d3caadb3168cd836bd6a68c (patch) | |
| tree | 6c05261c7ea83d94c2fc0a372c06a1f1af4612f3 | |
| parent | 5ac729998e22941a13b0ef8db04913732fbd6271 (diff) | |
| download | ioquake3-aero-e77331a64ef2c7260d3caadb3168cd836bd6a68c.tar.gz ioquake3-aero-e77331a64ef2c7260d3caadb3168cd836bd6a68c.zip | |
* q3lcc is no longer the default target in the Makefile
* Changed readme to suggest using the root Makefile instead of the one in
code/unix
git-svn-id: svn://svn.icculus.org/quake3/trunk@149 edf5b092-35ff-0310-97b2-ce42778d08ea
| -rw-r--r-- | code/unix/Makefile | 30 | ||||
| -rw-r--r-- | i_o-q3-readme | 4 |
2 files changed, 17 insertions, 17 deletions
diff --git a/code/unix/Makefile b/code/unix/Makefile index 5337057..7834fec 100644 --- a/code/unix/Makefile +++ b/code/unix/Makefile @@ -414,21 +414,6 @@ DO_DED_CC=$(CC) -DDEDICATED -DC_ONLY $(CFLAGS) -o $@ -c $< DO_WINDRES=$(WINDRES) -i $< -o $@ ############################################################################# -# QVM BUILD TOOLS -############################################################################# - -Q3LCC=../tools/q3lcc$(BINEXT) -Q3ASM=../tools/q3asm$(BINEXT) - -$(Q3LCC): - $(MAKE) -C ../tools/lcc install - -$(Q3ASM): - $(MAKE) -C ../tools/asm install - -DO_Q3LCC=$(Q3LCC) -o $@ -S -DQ3_VM -I$(CGDIR) -I$(GDIR) -I$(UIDIR) $< - -############################################################################# # MAIN TARGETS ############################################################################# @@ -469,6 +454,21 @@ makedirs: @if [ ! -d $(B)/q3static ];then mkdir $(B)/q3static;fi ############################################################################# +# QVM BUILD TOOLS +############################################################################# + +Q3LCC=../tools/q3lcc$(BINEXT) +Q3ASM=../tools/q3asm$(BINEXT) + +$(Q3LCC): + $(MAKE) -C ../tools/lcc install + +$(Q3ASM): + $(MAKE) -C ../tools/asm install + +DO_Q3LCC=$(Q3LCC) -o $@ -S -DQ3_VM -I$(CGDIR) -I$(GDIR) -I$(UIDIR) $< + +############################################################################# # CLIENT/SERVER ############################################################################# diff --git a/i_o-q3-readme b/i_o-q3-readme index 66f10a9..149648a 100644 --- a/i_o-q3-readme +++ b/i_o-q3-readme @@ -38,7 +38,8 @@ Run, enjoy! Compiling (Under Linux) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -cd code/unix && make +1. If not already there, change to the directory containing this readme +2. Run 'make' Installing under Linux ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -70,7 +71,6 @@ to accept and return long instead of int. Compiling under windows using MinGW ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - It is possible to compile ioQ3 using the MinGW (Minimalist GNU for Windows) toolset. It's a little more involved than compiling for linux; steps are as follows: |