tWin32 resources (icons etc.) now linked in and used - vaccinewars - be a docto… | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit b640bc616c1036dcad85a2bf4a4be86ade2e30a8 | |
parent dd7e3fbec2822c4b02112716620eb932a90ad227 | |
Author: Ben Webb <[email protected]> | |
Date: Wed, 30 May 2001 05:08:58 +0000 | |
Win32 resources (icons etc.) now linked in and used | |
Diffstat: | |
M Makefile.in | 1 + | |
M configure | 152 ++++++++++++++++-------------… | |
M configure.in | 4 ++++ | |
D cygwin.am | 2 -- | |
M doc/Makefile.in | 1 + | |
M src/Makefile.am | 6 ++++-- | |
M src/Makefile.in | 8 ++++++-- | |
A src/dopewars.rc | 1 + | |
M src/gtk_client.c | 2 +- | |
M src/gtkport.c | 8 ++++++-- | |
M src/gtkport.h | 2 +- | |
A src/pill.ico | 0 | |
12 files changed, 103 insertions(+), 84 deletions(-) | |
--- | |
diff --git a/Makefile.in b/Makefile.in | |
t@@ -89,6 +89,7 @@ RANLIB = @RANLIB@ | |
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ | |
USE_NLS = @USE_NLS@ | |
VERSION = @VERSION@ | |
+WNDRES = @WNDRES@ | |
l = @l@ | |
localedir = @localedir@ | |
diff --git a/configure b/configure | |
t@@ -3231,6 +3231,9 @@ EOF | |
LDFLAGS="$LDFLAGS -lglib-1.3" | |
+ WNDRES="dopewars.res" | |
+ | |
+ | |
GUI_SERVER="yes" | |
else | |
echo "$ac_t"""Configuring for Unix binary"" 1>&6 | |
t@@ -3288,7 +3291,7 @@ fi | |
# Extract the first word of "glib-config", so it can be a program name with … | |
set dummy glib-config; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:3292: checking for $ac_word" >&5 | |
+echo "configure:3295: checking for $ac_word" >&5 | |
if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -3323,7 +3326,7 @@ fi | |
min_glib_version=1.2.0 | |
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 | |
-echo "configure:3327: checking for GLIB - version >= $min_glib_version" >&5 | |
+echo "configure:3330: checking for GLIB - version >= $min_glib_version" >&5 | |
no_glib="" | |
if test "$GLIB_CONFIG" = "no" ; then | |
no_glib=yes | |
t@@ -3346,7 +3349,7 @@ echo "configure:3327: checking for GLIB - version >= $mi… | |
echo $ac_n "cross compiling; assumed OK... $ac_c" | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 3350 "configure" | |
+#line 3353 "configure" | |
#include "confdefs.h" | |
#include <glib.h> | |
t@@ -3422,7 +3425,7 @@ main () | |
} | |
EOF | |
-if { (eval echo configure:3426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
: | |
else | |
t@@ -3456,7 +3459,7 @@ fi | |
CFLAGS="$CFLAGS $GLIB_CFLAGS" | |
LIBS="$LIBS $GLIB_LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 3460 "configure" | |
+#line 3463 "configure" | |
#include "confdefs.h" | |
#include <glib.h> | |
t@@ -3466,7 +3469,7 @@ int main() { | |
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version))… | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
echo "*** The test program compiled, but did not run. This usually means" | |
echo "*** that the run-time linker is not finding GLIB or finding th… | |
t@@ -3507,7 +3510,7 @@ rm -f conftest* | |
if test "$CURSES_CLIENT" = "yes" ; then | |
echo $ac_n "checking for newterm in -lncurses""... $ac_c" 1>&6 | |
-echo "configure:3511: checking for newterm in -lncurses" >&5 | |
+echo "configure:3514: checking for newterm in -lncurses" >&5 | |
ac_lib_var=`echo ncurses'_'newterm | sed 'y%./+-%__p_%'` | |
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
t@@ -3515,7 +3518,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lncurses $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 3519 "configure" | |
+#line 3522 "configure" | |
#include "confdefs.h" | |
/* Override any gcc2 internal prototype to avoid an error. */ | |
/* We use char because int might match the return type of a gcc2 | |
t@@ -3526,7 +3529,7 @@ int main() { | |
newterm() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -3555,7 +3558,7 @@ fi | |
if test "$ac_cv_lib_ncurses_newterm" = "no" ; then | |
echo $ac_n "checking for newterm in -lcurses""... $ac_c" 1>&6 | |
-echo "configure:3559: checking for newterm in -lcurses" >&5 | |
+echo "configure:3562: checking for newterm in -lcurses" >&5 | |
ac_lib_var=`echo curses'_'newterm | sed 'y%./+-%__p_%'` | |
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
t@@ -3563,7 +3566,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lcurses $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 3567 "configure" | |
+#line 3570 "configure" | |
#include "confdefs.h" | |
/* Override any gcc2 internal prototype to avoid an error. */ | |
/* We use char because int might match the return type of a gcc2 | |
t@@ -3574,7 +3577,7 @@ int main() { | |
newterm() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -3603,7 +3606,7 @@ fi | |
if test "$ac_cv_lib_curses_newterm" = "no" ; then | |
echo $ac_n "checking for newterm in -lcur_colr""... $ac_c" 1>&6 | |
-echo "configure:3607: checking for newterm in -lcur_colr" >&5 | |
+echo "configure:3610: checking for newterm in -lcur_colr" >&5 | |
ac_lib_var=`echo cur_colr'_'newterm | sed 'y%./+-%__p_%'` | |
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
t@@ -3611,7 +3614,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lcur_colr $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 3615 "configure" | |
+#line 3618 "configure" | |
#include "confdefs.h" | |
/* Override any gcc2 internal prototype to avoid an error. */ | |
/* We use char because int might match the return type of a gcc2 | |
t@@ -3622,7 +3625,7 @@ int main() { | |
newterm() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -3708,7 +3711,7 @@ fi | |
# Extract the first word of "gtk-config", so it can be a program name with a… | |
set dummy gtk-config; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:3712: checking for $ac_word" >&5 | |
+echo "configure:3715: checking for $ac_word" >&5 | |
if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -3743,7 +3746,7 @@ fi | |
min_gtk_version=1.2.0 | |
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 | |
-echo "configure:3747: checking for GTK - version >= $min_gtk_version" >&5 | |
+echo "configure:3750: checking for GTK - version >= $min_gtk_version" >&5 | |
no_gtk="" | |
if test "$GTK_CONFIG" = "no" ; then | |
no_gtk=yes | |
t@@ -3766,7 +3769,7 @@ echo "configure:3747: checking for GTK - version >= $min… | |
echo $ac_n "cross compiling; assumed OK... $ac_c" | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 3770 "configure" | |
+#line 3773 "configure" | |
#include "confdefs.h" | |
#include <gtk/gtk.h> | |
t@@ -3844,7 +3847,7 @@ main () | |
} | |
EOF | |
-if { (eval echo configure:3848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
: | |
else | |
t@@ -3878,7 +3881,7 @@ fi | |
CFLAGS="$CFLAGS $GTK_CFLAGS" | |
LIBS="$LIBS $GTK_LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 3882 "configure" | |
+#line 3885 "configure" | |
#include "confdefs.h" | |
#include <gtk/gtk.h> | |
t@@ -3888,7 +3891,7 @@ int main() { | |
return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
echo "*** The test program compiled, but did not run. This usually means" | |
echo "*** that the run-time linker is not finding GTK or finding the… | |
t@@ -3938,9 +3941,9 @@ rm -f conftest* | |
GUI_SERVER="no" | |
echo $ac_n "checking for socklen_t data type""... $ac_c" 1>&6 | |
-echo "configure:3942: checking for socklen_t data type" >&5 | |
+echo "configure:3945: checking for socklen_t data type" >&5 | |
cat > conftest.$ac_ext <<EOF | |
-#line 3944 "configure" | |
+#line 3947 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <sys/socket.h> | |
t@@ -3948,7 +3951,7 @@ int main() { | |
socklen_t val | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:3955: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
echo "$ac_t""yes" 1>&6 | |
cat >> confdefs.h <<\EOF | |
t@@ -4009,12 +4012,12 @@ if test "$GUI_CLIENT" = "yes" -o "$GUI_SERVER" = "yes"… | |
fi | |
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 | |
-echo "configure:4013: checking for ANSI C header files" >&5 | |
+echo "configure:4016: checking for ANSI C header files" >&5 | |
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4018 "configure" | |
+#line 4021 "configure" | |
#include "confdefs.h" | |
#include <stdlib.h> | |
#include <stdarg.h> | |
t@@ -4022,7 +4025,7 @@ else | |
#include <float.h> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:4026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:4029: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
if test -z "$ac_err"; then | |
rm -rf conftest* | |
t@@ -4039,7 +4042,7 @@ rm -f conftest* | |
if test $ac_cv_header_stdc = yes; then | |
# SunOS 4.x string.h does not declare mem*, contrary to ANSI. | |
cat > conftest.$ac_ext <<EOF | |
-#line 4043 "configure" | |
+#line 4046 "configure" | |
#include "confdefs.h" | |
#include <string.h> | |
EOF | |
t@@ -4057,7 +4060,7 @@ fi | |
if test $ac_cv_header_stdc = yes; then | |
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. | |
cat > conftest.$ac_ext <<EOF | |
-#line 4061 "configure" | |
+#line 4064 "configure" | |
#include "confdefs.h" | |
#include <stdlib.h> | |
EOF | |
t@@ -4078,7 +4081,7 @@ if test "$cross_compiling" = yes; then | |
: | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4082 "configure" | |
+#line 4085 "configure" | |
#include "confdefs.h" | |
#include <ctype.h> | |
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') | |
t@@ -4089,7 +4092,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOU… | |
exit (0); } | |
EOF | |
-if { (eval echo configure:4093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
: | |
else | |
t@@ -4113,12 +4116,12 @@ EOF | |
fi | |
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 | |
-echo "configure:4117: checking for sys/wait.h that is POSIX.1 compatible" >&5 | |
+echo "configure:4120: checking for sys/wait.h that is POSIX.1 compatible" >&5 | |
if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4122 "configure" | |
+#line 4125 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <sys/wait.h> | |
t@@ -4134,7 +4137,7 @@ wait (&s); | |
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4138: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:4141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_header_sys_wait_h=yes | |
else | |
t@@ -4158,17 +4161,17 @@ for ac_hdr in fcntl.h sys/time.h unistd.h stdlib.h | |
do | |
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | |
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | |
-echo "configure:4162: checking for $ac_hdr" >&5 | |
+echo "configure:4165: checking for $ac_hdr" >&5 | |
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4167 "configure" | |
+#line 4170 "configure" | |
#include "confdefs.h" | |
#include <$ac_hdr> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:4172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:4175: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
if test -z "$ac_err"; then | |
rm -rf conftest* | |
t@@ -4196,12 +4199,12 @@ done | |
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $… | |
-echo "configure:4200: checking whether time.h and sys/time.h may both be inclu… | |
+echo "configure:4203: checking whether time.h and sys/time.h may both be inclu… | |
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4205 "configure" | |
+#line 4208 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <sys/time.h> | |
t@@ -4210,7 +4213,7 @@ int main() { | |
struct tm *tp; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4214: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:4217: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_header_time=yes | |
else | |
t@@ -4231,12 +4234,12 @@ EOF | |
fi | |
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" … | |
-echo "configure:4235: checking whether struct tm is in sys/time.h or time.h" >… | |
+echo "configure:4238: checking whether struct tm is in sys/time.h or time.h" >… | |
if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4240 "configure" | |
+#line 4243 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <time.h> | |
t@@ -4244,7 +4247,7 @@ int main() { | |
struct tm *tp; tp->tm_sec; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4248: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:4251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_struct_tm=time.h | |
else | |
t@@ -4266,7 +4269,7 @@ fi | |
echo $ac_n "checking size of long long""... $ac_c" 1>&6 | |
-echo "configure:4270: checking size of long long" >&5 | |
+echo "configure:4273: checking size of long long" >&5 | |
if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -4274,7 +4277,7 @@ else | |
{ echo "configure: error: can not run test program while cross compiling" … | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4278 "configure" | |
+#line 4281 "configure" | |
#include "confdefs.h" | |
#include <stdio.h> | |
main() | |
t@@ -4285,7 +4288,7 @@ main() | |
exit(0); | |
} | |
EOF | |
-if { (eval echo configure:4289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_sizeof_long_long=`cat conftestval` | |
else | |
t@@ -4306,7 +4309,7 @@ EOF | |
echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 | |
-echo "configure:4310: checking for 8-bit clean memcmp" >&5 | |
+echo "configure:4313: checking for 8-bit clean memcmp" >&5 | |
if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -4314,7 +4317,7 @@ else | |
ac_cv_func_memcmp_clean=no | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4318 "configure" | |
+#line 4321 "configure" | |
#include "confdefs.h" | |
main() | |
t@@ -4324,7 +4327,7 @@ main() | |
} | |
EOF | |
-if { (eval echo configure:4328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_func_memcmp_clean=yes | |
else | |
t@@ -4342,7 +4345,7 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 | |
test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" | |
echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6 | |
-echo "configure:4346: checking whether setvbuf arguments are reversed" >&5 | |
+echo "configure:4349: checking whether setvbuf arguments are reversed" >&5 | |
if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -4350,7 +4353,7 @@ else | |
{ echo "configure: error: can not run test program while cross compiling" … | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4354 "configure" | |
+#line 4357 "configure" | |
#include "confdefs.h" | |
#include <stdio.h> | |
/* If setvbuf has the reversed format, exit 0. */ | |
t@@ -4364,7 +4367,7 @@ main () { | |
exit(0); /* Non-reversed systems segv here. */ | |
} | |
EOF | |
-if { (eval echo configure:4368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_func_setvbuf_reversed=yes | |
else | |
t@@ -4388,12 +4391,12 @@ EOF | |
fi | |
echo $ac_n "checking for strftime""... $ac_c" 1>&6 | |
-echo "configure:4392: checking for strftime" >&5 | |
+echo "configure:4395: checking for strftime" >&5 | |
if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4397 "configure" | |
+#line 4400 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char strftime(); below. */ | |
t@@ -4416,7 +4419,7 @@ strftime(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_strftime=yes" | |
else | |
t@@ -4438,7 +4441,7 @@ else | |
echo "$ac_t""no" 1>&6 | |
# strftime is in -lintl on SCO UNIX. | |
echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6 | |
-echo "configure:4442: checking for strftime in -lintl" >&5 | |
+echo "configure:4445: checking for strftime in -lintl" >&5 | |
ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'` | |
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
t@@ -4446,7 +4449,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lintl $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 4450 "configure" | |
+#line 4453 "configure" | |
#include "confdefs.h" | |
/* Override any gcc2 internal prototype to avoid an error. */ | |
/* We use char because int might match the return type of a gcc2 | |
t@@ -4457,7 +4460,7 @@ int main() { | |
strftime() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -4486,12 +4489,12 @@ fi | |
for ac_func in strdup strstr | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:4490: checking for $ac_func" >&5 | |
+echo "configure:4493: checking for $ac_func" >&5 | |
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4495 "configure" | |
+#line 4498 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -4514,7 +4517,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -4545,14 +4548,14 @@ if test "$CYGWIN" = "yes" ; then | |
else | |
echo $ac_n "checking for library containing socket""... $ac_c" 1>&6 | |
-echo "configure:4549: checking for library containing socket" >&5 | |
+echo "configure:4552: checking for library containing socket" >&5 | |
if eval "test \"`echo '$''{'ac_cv_search_socket'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
ac_func_search_save_LIBS="$LIBS" | |
ac_cv_search_socket="no" | |
cat > conftest.$ac_ext <<EOF | |
-#line 4556 "configure" | |
+#line 4559 "configure" | |
#include "confdefs.h" | |
/* Override any gcc2 internal prototype to avoid an error. */ | |
/* We use char because int might match the return type of a gcc2 | |
t@@ -4563,7 +4566,7 @@ int main() { | |
socket() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_socket="none required" | |
else | |
t@@ -4574,7 +4577,7 @@ rm -f conftest* | |
test "$ac_cv_search_socket" = "no" && for i in socket; do | |
LIBS="-l$i $ac_func_search_save_LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 4578 "configure" | |
+#line 4581 "configure" | |
#include "confdefs.h" | |
/* Override any gcc2 internal prototype to avoid an error. */ | |
/* We use char because int might match the return type of a gcc2 | |
t@@ -4585,7 +4588,7 @@ int main() { | |
socket() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_socket="-l$i" | |
break | |
t@@ -4607,14 +4610,14 @@ else : | |
fi | |
echo $ac_n "checking for library containing gethostbyname""... $ac_c" 1>&6 | |
-echo "configure:4611: checking for library containing gethostbyname" >&5 | |
+echo "configure:4614: checking for library containing gethostbyname" >&5 | |
if eval "test \"`echo '$''{'ac_cv_search_gethostbyname'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
ac_func_search_save_LIBS="$LIBS" | |
ac_cv_search_gethostbyname="no" | |
cat > conftest.$ac_ext <<EOF | |
-#line 4618 "configure" | |
+#line 4621 "configure" | |
#include "confdefs.h" | |
/* Override any gcc2 internal prototype to avoid an error. */ | |
/* We use char because int might match the return type of a gcc2 | |
t@@ -4625,7 +4628,7 @@ int main() { | |
gethostbyname() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_gethostbyname="none required" | |
else | |
t@@ -4636,7 +4639,7 @@ rm -f conftest* | |
test "$ac_cv_search_gethostbyname" = "no" && for i in nsl socket; do | |
LIBS="-l$i $ac_func_search_save_LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 4640 "configure" | |
+#line 4643 "configure" | |
#include "confdefs.h" | |
/* Override any gcc2 internal prototype to avoid an error. */ | |
/* We use char because int might match the return type of a gcc2 | |
t@@ -4647,7 +4650,7 @@ int main() { | |
gethostbyname() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_gethostbyname="-l$i" | |
break | |
t@@ -4670,12 +4673,12 @@ fi | |
for ac_func in socket gethostbyname select | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:4674: checking for $ac_func" >&5 | |
+echo "configure:4677: checking for $ac_func" >&5 | |
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4679 "configure" | |
+#line 4682 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -4698,7 +4701,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -4929,6 +4932,7 @@ s%@GT_YES@%$GT_YES%g | |
s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g | |
s%@l@%$l%g | |
s%@localedir@%$localedir%g | |
+s%@WNDRES@%$WNDRES%g | |
s%@GLIB_CONFIG@%$GLIB_CONFIG%g | |
s%@GLIB_CFLAGS@%$GLIB_CFLAGS%g | |
s%@GLIB_LIBS@%$GLIB_LIBS%g | |
diff --git a/configure.in b/configure.in | |
t@@ -53,6 +53,10 @@ if test "$CYGWIN" = "yes" ; then | |
dnl Glib stuff | |
LDFLAGS="$LDFLAGS -lglib-1.3" | |
+ dnl We need to compile and then link in the Windows resources | |
+ WNDRES="dopewars.res" | |
+ AC_SUBST(WNDRES) | |
+ | |
dnl Use graphical server by default | |
GUI_SERVER="yes" | |
else | |
diff --git a/cygwin.am b/cygwin.am | |
t@@ -1,2 +0,0 @@ | |
-dopewars.res : dopewars.rc | |
- (echo "#include <windows.h>"; tr -d '\r' < dopewars.rc) | windres -O c… | |
diff --git a/doc/Makefile.in b/doc/Makefile.in | |
t@@ -89,6 +89,7 @@ RANLIB = @RANLIB@ | |
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ | |
USE_NLS = @USE_NLS@ | |
VERSION = @VERSION@ | |
+WNDRES = @WNDRES@ | |
l = @l@ | |
localedir = @localedir@ | |
diff --git a/src/Makefile.am b/src/Makefile.am | |
t@@ -2,9 +2,9 @@ bin_PROGRAMS = dopewars | |
dopewars_SOURCES = AIPlayer.c serverside.c dopewars.c message.c \ | |
curses_client.c gtk_client.c winmain.c \ | |
dopeos.c tstring.c @GTKPORT_C@ | |
-dopewars_DEPENDENCIES = @INTLLIBS@ @GTKPORT_O@ | |
+dopewars_DEPENDENCIES = @INTLLIBS@ @GTKPORT_O@ @WNDRES@ | |
INCLUDES = @GTK_CFLAGS@ -I.. -I. | |
-LDADD = @GTKPORT_O@ @GTK_LIBS@ @INTLLIBS@ | |
+LDADD = @GTKPORT_O@ @GTK_LIBS@ @INTLLIBS@ @WNDRES@ | |
DEFS = @DEFS@ -DLOCALEDIR=\"${localedir}\" | |
install-exec-hook: | |
t@@ -12,3 +12,5 @@ install-exec-hook: | |
chown root:wheel ${DESTDIR}${bindir}/dopewars | |
chmod 2755 ${DESTDIR}${bindir}/dopewars | |
+%.res: %.rc | |
+ windres -O coff -o $@ $< | |
diff --git a/src/Makefile.in b/src/Makefile.in | |
t@@ -89,15 +89,16 @@ RANLIB = @RANLIB@ | |
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ | |
USE_NLS = @USE_NLS@ | |
VERSION = @VERSION@ | |
+WNDRES = @WNDRES@ | |
l = @l@ | |
localedir = @localedir@ | |
bin_PROGRAMS = dopewars | |
dopewars_SOURCES = AIPlayer.c serverside.c dopewars.c message.c … | |
-dopewars_DEPENDENCIES = @INTLLIBS@ @GTKPORT_O@ | |
+dopewars_DEPENDENCIES = @INTLLIBS@ @GTKPORT_O@ @WNDRES@ | |
INCLUDES = @GTK_CFLAGS@ -I.. -I. | |
-LDADD = @GTKPORT_O@ @GTK_LIBS@ @INTLLIBS@ | |
+LDADD = @GTKPORT_O@ @GTK_LIBS@ @INTLLIBS@ @WNDRES@ | |
DEFS = @DEFS@ -DLOCALEDIR=\"${localedir}\" | |
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | |
CONFIG_HEADER = ../config.h | |
t@@ -345,6 +346,9 @@ install-exec-hook: | |
chown root:wheel ${DESTDIR}${bindir}/dopewars | |
chmod 2755 ${DESTDIR}${bindir}/dopewars | |
+%.res: %.rc | |
+ windres -O coff -o $@ $< | |
+ | |
# Tell versions [3.59,3.63) of GNU make to not export all variables. | |
# Otherwise a system limit (for SysV at least) may be exceeded. | |
.NOEXPORT: | |
diff --git a/src/dopewars.rc b/src/dopewars.rc | |
t@@ -0,0 +1 @@ | |
+mainicon ICON pill.ico | |
diff --git a/src/gtk_client.c b/src/gtk_client.c | |
t@@ -1690,7 +1690,7 @@ char GtkLoop(int *argc,char **argv[],char ReturnOnFail) { | |
gint nmenu_items = sizeof(menu_items) / sizeof(menu_items[0]); | |
#ifdef CYGWIN | |
- win32_init(hInstance,hPrevInstance); | |
+ win32_init(hInstance,hPrevInstance,"mainicon"); | |
#else | |
gtk_set_locale(); | |
if (ReturnOnFail && !gtk_init_check(argc,argv)) return FALSE; | |
diff --git a/src/gtkport.c b/src/gtkport.c | |
t@@ -977,7 +977,7 @@ LRESULT APIENTRY TextWndProc(HWND hwnd,UINT msg,WPARAM wPa… | |
return CallWindowProc(wpOrigTextProc,hwnd,msg,wParam,lParam); | |
} | |
-void win32_init(HINSTANCE hInstance,HINSTANCE hPrevInstance) { | |
+void win32_init(HINSTANCE hInstance,HINSTANCE hPrevInstance,char *MainIcon) { | |
WNDCLASS wc; | |
hInst=hInstance; | |
hFont=(HFONT)GetStockObject(DEFAULT_GUI_FONT); | |
t@@ -989,7 +989,11 @@ void win32_init(HINSTANCE hInstance,HINSTANCE hPrevInstan… | |
wc.cbClsExtra = 0; | |
wc.cbWndExtra = 0; | |
wc.hInstance = hInstance; | |
- wc.hIcon = LoadIcon(NULL,IDI_APPLICATION); | |
+ if (MainIcon) { | |
+ wc.hIcon = LoadIcon(hInstance,MainIcon); | |
+ } else { | |
+ wc.hIcon = LoadIcon(NULL,IDI_APPLICATION); | |
+ } | |
wc.hCursor = LoadCursor(NULL,IDC_ARROW); | |
wc.hbrBackground = (HBRUSH)(1+COLOR_BTNFACE); | |
wc.lpszMenuName = NULL; | |
diff --git a/src/gtkport.h b/src/gtkport.h | |
t@@ -581,7 +581,7 @@ guint gtk_signal_connect(GtkObject *object,const gchar *na… | |
guint gtk_signal_connect_object(GtkObject *object,const gchar *name, | |
GtkSignalFunc func,GtkObject *slot_object); | |
void gtk_signal_emit(GtkObject *object,const gchar *name, ...); | |
-void win32_init(HINSTANCE hInstance,HINSTANCE hPrevInstance); | |
+void win32_init(HINSTANCE hInstance,HINSTANCE hPrevInstance,char *MainIcon); | |
void gtk_menu_shell_insert(GtkMenuShell *menu_shell,GtkWidget *child, | |
gint position); | |
void gtk_menu_shell_append(GtkMenuShell *menu_shell,GtkWidget *child); | |
diff --git a/src/pill.ico b/src/pill.ico | |
Binary files differ. |