[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[netPanzer-CVS] netpanzer ./configure.ac src/NetPanzer/Core/mai...
From: |
Matthias Braun |
Subject: |
[netPanzer-CVS] netpanzer ./configure.ac src/NetPanzer/Core/mai... |
Date: |
Wed, 24 Sep 2003 16:31:10 -0400 |
CVSROOT: /cvsroot/netpanzer
Module name: netpanzer
Branch:
Changes by: Matthias Braun <address@hidden> 03/09/24 16:31:10
Modified files:
. : configure.ac
src/NetPanzer/Core: main.cpp
Added files:
mk/autoconf : np_lang_program.m4
Log message:
some hacks for SDL on win32
Patches:
Index: netpanzer/configure.ac
diff -u netpanzer/configure.ac:1.2 netpanzer/configure.ac:1.3
--- netpanzer/configure.ac:1.2 Tue Sep 23 21:26:18 2003
+++ netpanzer/configure.ac Wed Sep 24 16:31:09 2003
@@ -70,14 +70,14 @@
AM_PATH_SDL([1.2.5], , AC_MSG_ERROR([Please install libsdl >= 1.2.]))
NP_FINDLIB([SDLNET], [SDL_net >= 1.2],
- AC_LANG_PROGRAM([#include <SDL_net.h>], [SDLNet_Init();]),
+ NP_LANG_PROGRAM([#include <SDL_net.h>], [SDLNet_Init();]),
[], [-lSDL_net],
[],
[AC_MSG_ERROR([Please install SDLNet >= 1.2.4])],
[$SDL_CFLAGS], [$SDL_LIBS])
NP_FINDLIB([SDLMIXER], [SDL_mixer >= 1.2],
- AC_LANG_PROGRAM([#include <SDL_mixer.h>
+ NP_LANG_PROGRAM([#include <SDL_mixer.h>
#if MIX_MAJOR_VERSION < 1
# error SDLMix too old
#else
@@ -93,14 +93,14 @@
[$SDL_CFLAGS], [$SDL_LIBS])
NP_FINDLIB([SDLIMAGE], [SDL_image >= 1.2],
- AC_LANG_PROGRAM([#include <SDL_image.h>], [IMG_Load("");]),
+ NP_LANG_PROGRAM([#include <SDL_image.h>], [IMG_Load("");]),
[], [-lSDL_image],
[],
[AC_MSG_ERROR([Please install SDLImage >= 1.2.1])],
[$SDL_CFLAGS], [$SDL_LIBS])
NP_FINDLIB([PHYSFS], [physfs >= 1.9],
- AC_LANG_PROGRAM([#include <physfs.h>
+ NP_LANG_PROGRAM([#include <physfs.h>
#if PHYSFS_VER_MINOR < 1
# error PHYSFS is too old
#else
Index: netpanzer/src/NetPanzer/Core/main.cpp
diff -u netpanzer/src/NetPanzer/Core/main.cpp:1.10
netpanzer/src/NetPanzer/Core/main.cpp:1.11
--- netpanzer/src/NetPanzer/Core/main.cpp:1.10 Tue Sep 23 21:26:19 2003
+++ netpanzer/src/NetPanzer/Core/main.cpp Wed Sep 24 16:31:09 2003
@@ -169,7 +169,7 @@
}
}
-int main(int argc, char** argv)
+int netpanzer_main(int argc, char** argv)
{
initialise(argc, argv);
@@ -203,4 +203,11 @@
return 0;
}
+// XXX these tweaks are need for SDL on win32
+extern "C" {
+ int main(int argc, char** argv)
+ {
+ return netpanzer_main(argc, argv);
+ }
+}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [netPanzer-CVS] netpanzer ./configure.ac src/NetPanzer/Core/mai...,
Matthias Braun <=