1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109
|
Description: Centralise conditional usage messages, and declare various configuration values
Origin: other
--- koules-1.4.orig/xlib/init.c
+++ koules-1.4/xlib/init.c
@@ -769,6 +770,32 @@
#endif
break;
default:
+#ifdef NETSUPPORT
+#define USAGE_NETSUPPORT " -S run koules as network server\n \
+-C<host> run koules as network client\n \
+-P<port> select port. Default is:%i\n \
+-W run server in width mode-support for 320x200 svgalib and OS/2 clients\n \
+-L<level> select level for server\n \
+-D<number> select dificulty for server:\n \
+ 0: nightmare\n \
+ 1: hard\n \
+ 2: medium(default and recomended)\n \
+ 3: easy\n \
+ 4: very easy\n \
+-K run server in deathmatch mode\n "
+#else
+#define USAGE_NETSUPPORT ""
+#endif
+#ifdef SOUND
+#define USAGE_SOUND " -d Disable sound support\n"
+#else
+#define USAGE_SOUND ""
+#endif
+#ifdef MITSHM
+#define USAGE_MITSHM " -M DISABLE shared memory support\n"
+#else
+#define USAGE_MITSHM ""
+#endif
printf ("USAGE:"
" -h for help\n"
" -b for blackandwhite displays\n"
@@ -778,27 +805,10 @@
" -p use private colormap\n"
" -y Synchronize with X(for debugging)\n"
" -f nofade(for debugging)\n"
-#ifdef SOUND
- " -d Disable sound support\n"
-#endif
+ USAGE_SOUND
" -x Disable X11 pointer\n"
-#ifdef MITSHM
- " -M DISABLE shared memory support\n"
-#endif
-#ifdef NETSUPPORT
- " -S run koules as network server\n"
- " -C<host> run koules as network client\n"
- " -P<port> select port. Default is:%i\n"
- " -W run server in width mode-support for 320x200 svgalib and OS/2 clients\n"
- " -L<level> select level for server\n"
- " -D<number> select dificulty for server:\n"
- " 0: nightmare\n"
- " 1: hard\n"
- " 2: medium(default and recomended)\n"
- " 3: easy\n"
- " 4: very easy\n"
- " -K run server in deathmatch mode\n", DEFAULTINITPORT
-#endif
+ USAGE_MITSHM
+ USAGE_NETSUPPORT, DEFAULTINITPORT
);
exit (2);
}
--- koules-1.4.orig/Iconfig
+++ koules-1.4/Iconfig
@@ -18,7 +18,7 @@
use my emulation
If you are unsure try to leave it commented out. My emulation
works on most unixes*/
-/*#define HAVEUSLEEP*/
+#define HAVEUSLEEP
/* for network audio server(supported by most unixes)*/
/* It does not sound as well as built in driver ... koules uses too
much sounds*/
@@ -29,14 +29,14 @@
/* linux joystick support
Now compiles w/o joystick toolkit. For using joystick support is
joystick toolikit required...of course */
-/*#define JOYSTICK*/
+#define JOYSTICK
/*for fast 386 based assembler routines
recomended for linux*/
-/*#define I386ASSEMBLY*/
+#define I386ASSEMBLY
/* directories*/
-KOULESDIR =/usr/bin/X11
-SOUNDDIR =/usr/local/lib/koules
-MANDIR =/usr/local/man/man6
+KOULESDIR =/usr/games
+SOUNDDIR =/usr/games/lib/koules
+MANDIR =/usr/man/man6
/*You need some extra libraryes for BSD sockets compatibility?*/
/* TOP_INCLUDES = /* Sun users with GCC need this */
@@ -61,7 +61,7 @@
#endif
-#if defined(HPArchitecture)
+#if defined(HPArchitecture) && !defined(LinuxArchitecture)
SYSDEFS = +O3 -Ae
#if !defined(NAS_SOUND)&&!defined(RSOUND)
#define SOUND
|