Merge remote branch 'origin/master' into tzork/turrets-csqc

[xonotic/xonotic-data.pk3dir.git] / qcsrc / qc-client.cbp

diff --git a/qcsrc/qc-client.cbp b/qcsrc/qc-client.cbp
index 5ca67b7c3308240b3b1e70298a62a5479eb17b05..63e00e9e1774ea707be6c07f377eebdecc922765 100644 (file)
--- a/qcsrc/qc-client.cbp
+++ b/qcsrc/qc-client.cbp
@@ -11,7 +11,11 @@
                        <Build command="$make -src $makefile" />
                        <CompileFile command="$make -src $makefile" />
                        <Clean command="$make -src $makefile" />
+<<<<<<< HEAD
                        <DistClean command="$make -f $makefile distclean$target" />
+=======
+                       <DistClean command="" />
+>>>>>>> origin/master
                        <AskRebuildNeeded command="" />
                        <SilentBuild command="$make -src $makefile" />
                </MakeCommands>
@@ -45,17 +49,26 @@
                                        <Add option="-s" />
                                </Linker>
                                <MakeCommands>
+<<<<<<< HEAD
                                        <Build command="$make -src $makefile" />
                                        <CompileFile command="$make -src $makefile" />
                                        <Clean command="$make -src $makefile" />
                                        <DistClean command="" />
                                        <AskRebuildNeeded command="" />
                                        <SilentBuild command="$make -src $makefile" />
+=======
+                                       <Build command="$make -DRELEASE -src $makefile" />
+                                       <CompileFile command="$make -DRELEASE -src $makefile" />
+                                       <Clean command="$make -DRELEASE -src $makefile" />
+                                       <DistClean command="" />
+                                       <AskRebuildNeeded command="" />
+                                       <SilentBuild command="$make -DRELEASE -src $makefile" />
+>>>>>>> origin/master
                                </MakeCommands>
                        </Target>
                </Build>
                <Compiler>
-                       <Add option="-Wall" />
+                       <Add option="-g" />
                </Compiler>
                <Unit filename="client\Defs.qc" />
                <Unit filename="client\Main.qc" />
@@ -95,10 +108,13 @@
                <Unit filename="client\progs.src.REMOTE.src" />
                <Unit filename="client\projectile.qc" />
                <Unit filename="client\rubble.qc" />
+<<<<<<< HEAD
                <Unit filename="client\scoreboard.qc" />
                <Unit filename="client\scoreboard.qh" />
                <Unit filename="client\shownames.qc" />
                <Unit filename="client\shownames.qh" />
+=======
+>>>>>>> origin/master
                <Unit filename="client\sortlist.qc" />
                <Unit filename="client\target_music.qc" />
                <Unit filename="client\teamplay.qc" />
@@ -108,6 +124,8 @@
                <Unit filename="client\tturrets.qc" />
                <Unit filename="client\tturrets.qh" />
                <Unit filename="client\tuba.qc" />
+               <Unit filename="client\vehicles\vehicles.qc" />
+               <Unit filename="client\vehicles\vehicles.qh" />
                <Unit filename="client\wall.qc" />
                <Unit filename="client\waypointsprites.qc" />
                <Unit filename="client\waypointsprites.qh" />