Skip to content

Commit

Permalink
* q3lcc is no longer the default target in the Makefile
Browse files Browse the repository at this point in the history
* Changed readme to suggest using the root Makefile instead of the one in
  code/unix
  • Loading branch information
timangus committed Oct 8, 2005
1 parent 8866ce3 commit f6cb6ee
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
30 changes: 15 additions & 15 deletions code/unix/Makefile
Expand Up @@ -413,21 +413,6 @@ DO_AS=$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
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
#############################################################################
Expand Down Expand Up @@ -468,6 +453,21 @@ makedirs:
@if [ ! -d $(B)/missionpack/vm ];then mkdir $(B)/missionpack/vm;fi
@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
#############################################################################
Expand Down
4 changes: 2 additions & 2 deletions i_o-q3-readme
Expand Up @@ -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
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit f6cb6ee

Please sign in to comment.