Most SDL functions reimplemented.
parent
fa5e6c73d3
commit
cc662f9ac9
|
@ -1,4 +1,4 @@
|
||||||
AM_CPPFLAGS = -DYY_NO_INPUT $(WZ_CPPFLAGS) $(QT4_CFLAGS)
|
AM_CPPFLAGS = -DYY_NO_INPUT $(SDL_CFLAGS) $(WZ_CPPFLAGS) $(QT4_CFLAGS)
|
||||||
AM_CFLAGS = $(WZ_CFLAGS)
|
AM_CFLAGS = $(WZ_CFLAGS)
|
||||||
AM_CXXFLAGS = $(WZ_CXXFLAGS) $(QT4_CFLAGS)
|
AM_CXXFLAGS = $(WZ_CXXFLAGS) $(QT4_CFLAGS)
|
||||||
AM_LFLAGS = $(FLEX_FLAGS)
|
AM_LFLAGS = $(FLEX_FLAGS)
|
||||||
|
|
|
@ -48,6 +48,8 @@ bool selfTest = false;
|
||||||
* Player globals
|
* Player globals
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
static bool mousewarp = false;
|
||||||
|
|
||||||
uint32_t selectedPlayer = 0; /**< Current player */
|
uint32_t selectedPlayer = 0; /**< Current player */
|
||||||
uint32_t realSelectedPlayer = 0;
|
uint32_t realSelectedPlayer = 0;
|
||||||
|
|
||||||
|
@ -143,6 +145,16 @@ void frameShutDown(void)
|
||||||
resShutDown();
|
resShutDown();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void setMouseWarp(bool value)
|
||||||
|
{
|
||||||
|
mousewarp = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool getMouseWarp()
|
||||||
|
{
|
||||||
|
return mousewarp;
|
||||||
|
}
|
||||||
|
|
||||||
PHYSFS_file* openLoadFile(const char* fileName, bool hard_fail)
|
PHYSFS_file* openLoadFile(const char* fileName, bool hard_fail)
|
||||||
{
|
{
|
||||||
PHYSFS_file* fileHandle = PHYSFS_openRead(fileName);
|
PHYSFS_file* fileHandle = PHYSFS_openRead(fileName);
|
||||||
|
|
|
@ -34,6 +34,7 @@
|
||||||
#include "lib/framework/utf.h"
|
#include "lib/framework/utf.h"
|
||||||
#include "vector.h"
|
#include "vector.h"
|
||||||
|
|
||||||
|
#ifdef BACKEND_QT
|
||||||
/** Defines for all the key codes used. */
|
/** Defines for all the key codes used. */
|
||||||
enum KEY_CODE
|
enum KEY_CODE
|
||||||
{
|
{
|
||||||
|
@ -145,6 +146,135 @@ enum KEY_CODE
|
||||||
|
|
||||||
KEY_IGNORE = 5190
|
KEY_IGNORE = 5190
|
||||||
};
|
};
|
||||||
|
enum MOUSE_KEY_CODE
|
||||||
|
{
|
||||||
|
MOUSE_LMB = 1,
|
||||||
|
MOUSE_MMB,
|
||||||
|
MOUSE_RMB,
|
||||||
|
MOUSE_WUP,
|
||||||
|
MOUSE_WDN,
|
||||||
|
MOUSE_BAD
|
||||||
|
};
|
||||||
|
#else
|
||||||
|
#include <SDL.h>
|
||||||
|
enum KEY_CODE
|
||||||
|
{
|
||||||
|
KEY_ESC =SDLK_ESCAPE,
|
||||||
|
KEY_1 =SDLK_1,
|
||||||
|
KEY_2 =SDLK_2,
|
||||||
|
KEY_3 =SDLK_3,
|
||||||
|
KEY_4 =SDLK_4,
|
||||||
|
KEY_5 =SDLK_5,
|
||||||
|
KEY_6 =SDLK_6,
|
||||||
|
KEY_7 =SDLK_7,
|
||||||
|
KEY_8 =SDLK_8,
|
||||||
|
KEY_9 =SDLK_9,
|
||||||
|
KEY_0 =SDLK_0,
|
||||||
|
KEY_MINUS =SDLK_MINUS,
|
||||||
|
KEY_EQUALS =SDLK_EQUALS,
|
||||||
|
KEY_BACKSPACE =SDLK_BACKSPACE,
|
||||||
|
KEY_TAB =SDLK_TAB,
|
||||||
|
KEY_Q =SDLK_q,
|
||||||
|
KEY_W =SDLK_w,
|
||||||
|
KEY_E =SDLK_e,
|
||||||
|
KEY_R =SDLK_r,
|
||||||
|
KEY_T =SDLK_t,
|
||||||
|
KEY_Y =SDLK_y,
|
||||||
|
KEY_U =SDLK_u,
|
||||||
|
KEY_I =SDLK_i,
|
||||||
|
KEY_O =SDLK_o,
|
||||||
|
KEY_P =SDLK_p,
|
||||||
|
KEY_LBRACE =SDLK_LEFTBRACKET,
|
||||||
|
KEY_RBRACE =SDLK_RIGHTBRACKET,
|
||||||
|
KEY_RETURN =SDLK_RETURN,
|
||||||
|
KEY_LCTRL =SDLK_LCTRL,
|
||||||
|
KEY_A =SDLK_a,
|
||||||
|
KEY_S =SDLK_s,
|
||||||
|
KEY_D =SDLK_d,
|
||||||
|
KEY_F =SDLK_f,
|
||||||
|
KEY_G =SDLK_g,
|
||||||
|
KEY_H =SDLK_h,
|
||||||
|
KEY_J =SDLK_j,
|
||||||
|
KEY_K =SDLK_k,
|
||||||
|
KEY_L =SDLK_l,
|
||||||
|
KEY_SEMICOLON =SDLK_SEMICOLON,
|
||||||
|
KEY_QUOTE =SDLK_QUOTE,
|
||||||
|
KEY_BACKQUOTE =SDLK_BACKQUOTE,
|
||||||
|
KEY_LSHIFT =SDLK_LSHIFT,
|
||||||
|
KEY_LMETA =SDLK_LMETA,
|
||||||
|
KEY_LSUPER =SDLK_LSUPER,
|
||||||
|
KEY_BACKSLASH =SDLK_BACKSLASH,
|
||||||
|
KEY_Z =SDLK_z,
|
||||||
|
KEY_X =SDLK_x,
|
||||||
|
KEY_C =SDLK_c,
|
||||||
|
KEY_V =SDLK_v,
|
||||||
|
KEY_B =SDLK_b,
|
||||||
|
KEY_N =SDLK_n,
|
||||||
|
KEY_M =SDLK_m,
|
||||||
|
KEY_COMMA =SDLK_COMMA,
|
||||||
|
KEY_FULLSTOP =SDLK_PERIOD,
|
||||||
|
KEY_FORWARDSLASH =SDLK_SLASH,
|
||||||
|
KEY_RSHIFT =SDLK_RSHIFT,
|
||||||
|
KEY_RMETA =SDLK_RMETA,
|
||||||
|
KEY_RSUPER =SDLK_RSUPER,
|
||||||
|
KEY_KP_STAR =SDLK_KP_MULTIPLY,
|
||||||
|
KEY_LALT =SDLK_LALT,
|
||||||
|
KEY_SPACE =SDLK_SPACE,
|
||||||
|
KEY_CAPSLOCK =SDLK_CAPSLOCK,
|
||||||
|
KEY_F1 =SDLK_F1,
|
||||||
|
KEY_F2 =SDLK_F2,
|
||||||
|
KEY_F3 =SDLK_F3,
|
||||||
|
KEY_F4 =SDLK_F4,
|
||||||
|
KEY_F5 =SDLK_F5,
|
||||||
|
KEY_F6 =SDLK_F6,
|
||||||
|
KEY_F7 =SDLK_F7,
|
||||||
|
KEY_F8 =SDLK_F8,
|
||||||
|
KEY_F9 =SDLK_F9,
|
||||||
|
KEY_F10 =SDLK_F10,
|
||||||
|
KEY_NUMLOCK =SDLK_NUMLOCK,
|
||||||
|
KEY_SCROLLLOCK =SDLK_SCROLLOCK,
|
||||||
|
KEY_KP_7 =SDLK_KP7,
|
||||||
|
KEY_KP_8 =SDLK_KP8,
|
||||||
|
KEY_KP_9 =SDLK_KP9,
|
||||||
|
KEY_KP_MINUS =SDLK_KP_MINUS,
|
||||||
|
KEY_KP_4 =SDLK_KP4,
|
||||||
|
KEY_KP_5 =SDLK_KP5,
|
||||||
|
KEY_KP_6 =SDLK_KP6,
|
||||||
|
KEY_KP_PLUS =SDLK_KP_PLUS,
|
||||||
|
KEY_KP_1 =SDLK_KP1,
|
||||||
|
KEY_KP_2 =SDLK_KP2,
|
||||||
|
KEY_KP_3 =SDLK_KP3,
|
||||||
|
KEY_KP_0 =SDLK_KP0,
|
||||||
|
KEY_KP_FULLSTOP =SDLK_KP_PERIOD,
|
||||||
|
KEY_F11 =SDLK_F11,
|
||||||
|
KEY_F12 =SDLK_F12,
|
||||||
|
KEY_RCTRL =SDLK_RCTRL,
|
||||||
|
KEY_KP_BACKSLASH =SDLK_KP_DIVIDE,
|
||||||
|
KEY_RALT =SDLK_RALT,
|
||||||
|
KEY_HOME =SDLK_HOME,
|
||||||
|
KEY_UPARROW =SDLK_UP,
|
||||||
|
KEY_PAGEUP =SDLK_PAGEUP,
|
||||||
|
KEY_LEFTARROW =SDLK_LEFT,
|
||||||
|
KEY_RIGHTARROW =SDLK_RIGHT,
|
||||||
|
KEY_END =SDLK_END,
|
||||||
|
KEY_DOWNARROW =SDLK_DOWN,
|
||||||
|
KEY_PAGEDOWN =SDLK_PAGEDOWN,
|
||||||
|
KEY_INSERT =SDLK_INSERT,
|
||||||
|
KEY_DELETE =SDLK_DELETE,
|
||||||
|
KEY_KPENTER =SDLK_KP_ENTER,
|
||||||
|
KEY_IGNORE =5190
|
||||||
|
};
|
||||||
|
/** The largest possible scan code. */
|
||||||
|
#define KEY_MAXSCAN SDLK_LAST
|
||||||
|
enum MOUSE_KEY_CODE
|
||||||
|
{
|
||||||
|
MOUSE_LMB = SDL_BUTTON_LEFT,
|
||||||
|
MOUSE_MMB = SDL_BUTTON_MIDDLE,
|
||||||
|
MOUSE_RMB = SDL_BUTTON_RIGHT,
|
||||||
|
MOUSE_WUP = SDL_BUTTON_WHEELUP,
|
||||||
|
MOUSE_WDN = SDL_BUTTON_WHEELDOWN
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
/** Tell the input system that we have lost the focus. */
|
/** Tell the input system that we have lost the focus. */
|
||||||
extern void inputLoseFocus(void);
|
extern void inputLoseFocus(void);
|
||||||
|
@ -164,16 +294,6 @@ extern bool keyPressed(KEY_CODE code);
|
||||||
/** This returns true if the key went from being down to being up this frame. */
|
/** This returns true if the key went from being down to being up this frame. */
|
||||||
extern bool keyReleased(KEY_CODE code);
|
extern bool keyReleased(KEY_CODE code);
|
||||||
|
|
||||||
enum MOUSE_KEY_CODE
|
|
||||||
{
|
|
||||||
MOUSE_LMB = 1,
|
|
||||||
MOUSE_MMB,
|
|
||||||
MOUSE_RMB,
|
|
||||||
MOUSE_WUP,
|
|
||||||
MOUSE_WDN,
|
|
||||||
MOUSE_BAD
|
|
||||||
};
|
|
||||||
|
|
||||||
/** Return the current X position of the mouse. */
|
/** Return the current X position of the mouse. */
|
||||||
extern uint16_t mouseX(void) WZ_DECL_PURE;
|
extern uint16_t mouseX(void) WZ_DECL_PURE;
|
||||||
|
|
||||||
|
|
|
@ -25,13 +25,21 @@
|
||||||
|
|
||||||
#include <QtCore/QSize>
|
#include <QtCore/QSize>
|
||||||
|
|
||||||
|
#ifdef BACKEND_QT
|
||||||
struct _wzThread;
|
struct _wzThread;
|
||||||
struct _wzMutex;
|
struct _wzMutex;
|
||||||
struct _wzSemaphore;
|
struct _wzSemaphore;
|
||||||
|
|
||||||
typedef struct _wzThread WZ_THREAD;
|
typedef struct _wzThread WZ_THREAD;
|
||||||
typedef struct _wzMutex WZ_MUTEX;
|
typedef struct _wzMutex WZ_MUTEX;
|
||||||
typedef struct _wzSemaphore WZ_SEMAPHORE;
|
typedef struct _wzSemaphore WZ_SEMAPHORE;
|
||||||
|
#else
|
||||||
|
struct SDL_Thread;
|
||||||
|
struct SDL_mutex;
|
||||||
|
struct SDL_semaphore;
|
||||||
|
typedef SDL_Thread WZ_THREAD;
|
||||||
|
typedef SDL_mutex WZ_MUTEX;
|
||||||
|
typedef SDL_semaphore WZ_SEMAPHORE;
|
||||||
|
#endif
|
||||||
|
|
||||||
void wzMain(int &argc, char **argv);
|
void wzMain(int &argc, char **argv);
|
||||||
bool wzMain2();
|
bool wzMain2();
|
||||||
|
@ -51,10 +59,8 @@ bool wzGetSwapInterval();
|
||||||
|
|
||||||
// Thread related
|
// Thread related
|
||||||
WZ_THREAD *wzThreadCreate(int (*threadFunc)(void *), void *data);
|
WZ_THREAD *wzThreadCreate(int (*threadFunc)(void *), void *data);
|
||||||
#define wzThreadJoinResult(x, y) do { *(y) = wzThreadJoin(x); } while (0)
|
|
||||||
int wzThreadJoin(WZ_THREAD *thread);
|
int wzThreadJoin(WZ_THREAD *thread);
|
||||||
void wzThreadStart(WZ_THREAD *thread);
|
void wzThreadStart(WZ_THREAD *thread);
|
||||||
bool wzIsThreadDone(WZ_THREAD *thread);
|
|
||||||
void wzYieldCurrentThread(void);
|
void wzYieldCurrentThread(void);
|
||||||
WZ_MUTEX *wzMutexCreate(void);
|
WZ_MUTEX *wzMutexCreate(void);
|
||||||
void wzMutexDestroy(WZ_MUTEX *mutex);
|
void wzMutexDestroy(WZ_MUTEX *mutex);
|
||||||
|
@ -64,6 +70,5 @@ WZ_SEMAPHORE *wzSemaphoreCreate(int startValue);
|
||||||
void wzSemaphoreDestroy(WZ_SEMAPHORE *semaphore);
|
void wzSemaphoreDestroy(WZ_SEMAPHORE *semaphore);
|
||||||
void wzSemaphoreWait(WZ_SEMAPHORE *semaphore);
|
void wzSemaphoreWait(WZ_SEMAPHORE *semaphore);
|
||||||
void wzSemaphorePost(WZ_SEMAPHORE *semaphore);
|
void wzSemaphorePost(WZ_SEMAPHORE *semaphore);
|
||||||
int wzSemaphoreAvailable(WZ_SEMAPHORE *semaphore);
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -699,7 +699,7 @@ void NETaddRedirects(void)
|
||||||
debug(LOG_NET, "%s\n", __FUNCTION__);
|
debug(LOG_NET, "%s\n", __FUNCTION__);
|
||||||
if (!upnp_done)
|
if (!upnp_done)
|
||||||
{
|
{
|
||||||
wzThreadJoinResult(upnpdiscover, &upnp);
|
upnp = wzThreadJoin(upnpdiscover);
|
||||||
upnp_done = true;
|
upnp_done = true;
|
||||||
}
|
}
|
||||||
if (upnp) {
|
if (upnp) {
|
||||||
|
|
|
@ -48,8 +48,6 @@
|
||||||
#include "lib/gamelib/gtime.h"
|
#include "lib/gamelib/gtime.h"
|
||||||
#include <deque>
|
#include <deque>
|
||||||
|
|
||||||
static bool mousewarp = false;
|
|
||||||
|
|
||||||
/* The possible states for keys */
|
/* The possible states for keys */
|
||||||
typedef enum _key_state
|
typedef enum _key_state
|
||||||
{
|
{
|
||||||
|
@ -786,16 +784,6 @@ Vector2i mouseReleasePos(MOUSE_KEY_CODE code)
|
||||||
return aMouseState[code].releasePos;
|
return aMouseState[code].releasePos;
|
||||||
}
|
}
|
||||||
|
|
||||||
void setMouseWarp(bool value)
|
|
||||||
{
|
|
||||||
mousewarp = value;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool getMouseWarp()
|
|
||||||
{
|
|
||||||
return mousewarp;
|
|
||||||
}
|
|
||||||
|
|
||||||
void setMousePos(uint16_t x, uint16_t y)
|
void setMousePos(uint16_t x, uint16_t y)
|
||||||
{
|
{
|
||||||
if (mousewarp)
|
if (mousewarp)
|
||||||
|
@ -1025,11 +1013,6 @@ void wzThreadStart(WZ_THREAD *thread)
|
||||||
thread->start();
|
thread->start();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wzIsThreadDone(WZ_THREAD *thread)
|
|
||||||
{
|
|
||||||
return thread->isFinished();
|
|
||||||
}
|
|
||||||
|
|
||||||
void wzYieldCurrentThread()
|
void wzYieldCurrentThread()
|
||||||
{
|
{
|
||||||
#if QT_VERSION >= 0x040500
|
#if QT_VERSION >= 0x040500
|
||||||
|
@ -1077,11 +1060,6 @@ void wzSemaphorePost(WZ_SEMAPHORE *semaphore)
|
||||||
semaphore->release();
|
semaphore->release();
|
||||||
}
|
}
|
||||||
|
|
||||||
int wzSemaphoreAvailable(WZ_SEMAPHORE *semaphore)
|
|
||||||
{
|
|
||||||
return semaphore->available();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**************************/
|
/**************************/
|
||||||
/*** Font support ***/
|
/*** Font support ***/
|
||||||
/**************************/
|
/**************************/
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
AM_CPPFLAGS = -DYY_NO_INPUT $(WZ_CPPFLAGS)
|
AM_CPPFLAGS = -DYY_NO_INPUT $(SDL_CFLAGS) $(WZ_CPPFLAGS)
|
||||||
AM_CFLAGS = $(WZ_CFLAGS)
|
AM_CFLAGS = $(WZ_CFLAGS)
|
||||||
AM_CXXFLAGS = $(WZ_CXXFLAGS)
|
AM_CXXFLAGS = $(WZ_CXXFLAGS)
|
||||||
|
|
||||||
|
@ -8,4 +8,5 @@ noinst_HEADERS = \
|
||||||
|
|
||||||
libsdl_a_SOURCES = \
|
libsdl_a_SOURCES = \
|
||||||
main_sdl.cpp \
|
main_sdl.cpp \
|
||||||
|
input.cpp \
|
||||||
scrap.cpp
|
scrap.cpp
|
||||||
|
|
|
@ -1,7 +1,128 @@
|
||||||
#include <QtCore/QCoreApplication>
|
#include <QtCore/QCoreApplication>
|
||||||
|
#include "lib/framework/wzapp.h"
|
||||||
|
#include <SDL.h>
|
||||||
|
#include <SDL_thread.h>
|
||||||
|
#include <SDL_timer.h>
|
||||||
|
|
||||||
extern void mainLoop();
|
extern void mainLoop();
|
||||||
|
|
||||||
|
unsigned int screenWidth = 0;
|
||||||
|
unsigned int screenHeight = 0;
|
||||||
|
|
||||||
|
/**************************/
|
||||||
|
/*** Misc support ***/
|
||||||
|
/**************************/
|
||||||
|
|
||||||
|
void wzSetCursor(CURSOR index)
|
||||||
|
{
|
||||||
|
// TBD
|
||||||
|
}
|
||||||
|
|
||||||
|
void wzShowMouse(bool visible)
|
||||||
|
{
|
||||||
|
SDL_ShowCursor(visible ? SDL_ENABLE : SDL_DISABLE);
|
||||||
|
}
|
||||||
|
|
||||||
|
int wzGetTicks()
|
||||||
|
{
|
||||||
|
return SDL_GetTicks();
|
||||||
|
}
|
||||||
|
|
||||||
|
void wzFatalDialog(char const*)
|
||||||
|
{
|
||||||
|
// no-op
|
||||||
|
}
|
||||||
|
|
||||||
|
void wzScreenFlip()
|
||||||
|
{
|
||||||
|
SDL_GL_SwapBuffers();
|
||||||
|
}
|
||||||
|
|
||||||
|
void wzQuit()
|
||||||
|
{
|
||||||
|
// no-op
|
||||||
|
}
|
||||||
|
|
||||||
|
void wzGrabMouse()
|
||||||
|
{
|
||||||
|
SDL_WM_GrabInput(SDL_GRAB_ON);
|
||||||
|
}
|
||||||
|
|
||||||
|
void wzReleaseMouse()
|
||||||
|
{
|
||||||
|
SDL_WM_GrabInput(SDL_GRAB_OFF);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**************************/
|
||||||
|
/*** Thread support ***/
|
||||||
|
/**************************/
|
||||||
|
|
||||||
|
WZ_THREAD *wzThreadCreate(int (*threadFunc)(void *), void *data)
|
||||||
|
{
|
||||||
|
return SDL_CreateThread(threadFunc, data);
|
||||||
|
}
|
||||||
|
|
||||||
|
int wzThreadJoin(WZ_THREAD *thread)
|
||||||
|
{
|
||||||
|
int result;
|
||||||
|
SDL_WaitThread(thread, &result);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
void wzThreadStart(WZ_THREAD *thread)
|
||||||
|
{
|
||||||
|
(void)thread; // no-op
|
||||||
|
}
|
||||||
|
|
||||||
|
void wzYieldCurrentThread()
|
||||||
|
{
|
||||||
|
SDL_Delay(40);
|
||||||
|
}
|
||||||
|
|
||||||
|
WZ_MUTEX *wzMutexCreate()
|
||||||
|
{
|
||||||
|
return SDL_CreateMutex();
|
||||||
|
}
|
||||||
|
|
||||||
|
void wzMutexDestroy(WZ_MUTEX *mutex)
|
||||||
|
{
|
||||||
|
SDL_DestroyMutex(mutex);
|
||||||
|
}
|
||||||
|
|
||||||
|
void wzMutexLock(WZ_MUTEX *mutex)
|
||||||
|
{
|
||||||
|
SDL_LockMutex(mutex);
|
||||||
|
}
|
||||||
|
|
||||||
|
void wzMutexUnlock(WZ_MUTEX *mutex)
|
||||||
|
{
|
||||||
|
SDL_UnlockMutex(mutex);
|
||||||
|
}
|
||||||
|
|
||||||
|
WZ_SEMAPHORE *wzSemaphoreCreate(int startValue)
|
||||||
|
{
|
||||||
|
return SDL_CreateSemaphore(startValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
void wzSemaphoreDestroy(WZ_SEMAPHORE *semaphore)
|
||||||
|
{
|
||||||
|
SDL_DestroySemaphore(semaphore);
|
||||||
|
}
|
||||||
|
|
||||||
|
void wzSemaphoreWait(WZ_SEMAPHORE *semaphore)
|
||||||
|
{
|
||||||
|
SDL_SemWait(semaphore);
|
||||||
|
}
|
||||||
|
|
||||||
|
void wzSemaphorePost(WZ_SEMAPHORE *semaphore)
|
||||||
|
{
|
||||||
|
SDL_SemPost(semaphore);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**************************/
|
||||||
|
/*** Main support ***/
|
||||||
|
/**************************/
|
||||||
|
|
||||||
void wzMain(int &argc, char **argv)
|
void wzMain(int &argc, char **argv)
|
||||||
{
|
{
|
||||||
QCoreApplication app(argc, argv); // For Qt-script.
|
QCoreApplication app(argc, argv); // For Qt-script.
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
AM_CPPFLAGS = $(WZ_CPPFLAGS) $(QT4_CFLAGS)
|
AM_CPPFLAGS = $(SDL_CFLAGS) $(WZ_CPPFLAGS) $(QT4_CFLAGS)
|
||||||
AM_CFLAGS = $(WZ_CFLAGS)
|
AM_CFLAGS = $(WZ_CFLAGS)
|
||||||
AM_CXXFLAGS = $(WZ_CXXFLAGS) $(QT4_CFLAGS)
|
AM_CXXFLAGS = $(WZ_CXXFLAGS) $(QT4_CFLAGS)
|
||||||
|
|
||||||
|
|
|
@ -281,6 +281,10 @@ if BACKEND_QT
|
||||||
warzone2100_LIBS += $(top_builddir)/lib/qtgame/libqtgame.a
|
warzone2100_LIBS += $(top_builddir)/lib/qtgame/libqtgame.a
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if BACKEND_SDL
|
||||||
|
warzone2100_LIBS += $(top_builddir)/lib/sdl/libsdl.a
|
||||||
|
endif
|
||||||
|
|
||||||
warzone2100_LDADD = $(warzone2100_LIBS) $(LTLIBINTL) $(SDL_LIBS) $(PHYSFS_LIBS) $(PNG_LIBS) $(OGGVORBIS_LIBS) \
|
warzone2100_LDADD = $(warzone2100_LIBS) $(LTLIBINTL) $(SDL_LIBS) $(PHYSFS_LIBS) $(PNG_LIBS) $(OGGVORBIS_LIBS) \
|
||||||
$(THEORA_LIBS) $(OPENAL_LIBS) $(OPENGLC_LIBS) $(OPENGL_LIBS) $(QT4_LIBS) $(QJSON_LIBS) $(GLEW_LIBS) \
|
$(THEORA_LIBS) $(OPENAL_LIBS) $(OPENGLC_LIBS) $(OPENGL_LIBS) $(QT4_LIBS) $(QJSON_LIBS) $(GLEW_LIBS) \
|
||||||
$(X_LIBS) $(X_EXTRA_LIBS) $(LDFLAGS)
|
$(X_LIBS) $(X_EXTRA_LIBS) $(LDFLAGS)
|
||||||
|
|
Loading…
Reference in New Issue