Changeset 2624


Ignore:
Timestamp:
Apr 3, 2013, 7:21:10 PM (10 years ago)
Author:
sam
Message:

build: a lot more emscripten build fixes.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/build/autotools/m4/lol-sdl.m4

    r2301 r2624  
    6767    SDL_CFLAGS="${SDL_CFLAGS} `${SDL_CONFIG} --cflags`"
    6868    SDL_LIBS="${SDL_LIBS} `${SDL_CONFIG} --libs`"
    69     AC_DEFINE(HAVE_SDL_H, 1, Define to 1 to use SDL.h),
     69    AC_DEFINE(HAVE_SDL_H, 1, Define to 1 to use SDL.h)
    7070  fi
    7171fi
  • trunk/build/lol-build

    r2619 r2624  
    241241        emscripten-*)
    242242            EM_HOME=$HOME/emscripten
    243             ./configure CC=$EM_HOME/emcc CXX=$EM_HOME/em++ AR=$EM_HOME/emar RANLIB=$EM_HOME/emranlib PKG_CONFIG=false ac_cv_exeext=".${platform##emscripten-}"
     243            ./configure CC=$EM_HOME/emcc CXX=$EM_HOME/em++ AR=$EM_HOME/emar RANLIB=$EM_HOME/emranlib PKG_CONFIG=/bin/false SDL_CONFIG=/bin/false ac_cv_exeext=".${platform##emscripten-}"
    244244            ;;
    245245        *)
  • trunk/configure.ac

    r2596 r2624  
    7878AC_CHECK_HEADERS(execinfo.h)
    7979AC_CHECK_HEADERS(sys/ioctl.h sys/ptrace.h sys/stat.h sys/syscall.h sys/user.h)
    80 AC_CHECK_HEADERS(sys/wait.h)
     80AC_CHECK_HEADERS(sys/wait.h sys/time.h)
    8181AC_CHECK_HEADERS(linux/kdev_t.h linux/major.h)
    8282AC_CHECK_HEADERS(security/pam_appl.h security/pam_misc.h)
     
    9090dnl  Common C functions
    9191AC_CHECK_FUNCS(getenv system tmpfile tmpnam getcwd _getcwd backtrace_symbols)
     92AC_CHECK_FUNCS(gettimeofday usleep)
    9293
    9394
  • trunk/src/application/application.cpp

    r2565 r2624  
    2525#elif defined __ANDROID__
    2626#   include "platform/android/androidapp.h"
     27#elif defined USE_SDL
     28#   include "platform/sdl/sdlapp.h"
     29#   include "platform/sdl/sdlinput.h"
    2730#elif defined HAVE_GLES_2X
    2831#   include "eglapp.h"
    29 #else
    30 #   include "platform/sdl/sdlapp.h"
    31 #   include "platform/sdl/sdlinput.h"
    3232#endif
    3333
     
    5353#elif defined __ANDROID__
    5454    AndroidApp app;
     55#elif defined USE_SDL
     56    SdlApp app;
    5557#elif defined HAVE_GLES_2X
    5658    /* FIXME: this macro is only deactivated if we include "lolgl.h" */
    5759    EglApp app;
    58 #elif defined USE_SDL
    59     SdlApp app;
    6060#else
    6161#   error No application class available on this platform
  • trunk/src/sys/timer.cpp

    r2506 r2624  
    99//
    1010
    11 #if defined HAVE_CONFIG_H
     11#if HAVE_CONFIG_H
    1212#   include "config.h"
    1313#endif
     
    1616#include <stdint.h>
    1717
    18 #if defined __linux__ || defined __native_client__ || defined __APPLE__
     18#if __linux__ || __native_client__ || __APPLE__ \
     19 || (HAVE_GETTIMEOFDAY && HAVE_USLEEP && HAVE_SYS_TIME_H && HAVE_UNISTD_H)
    1920#   include <sys/time.h>
    2021#   include <unistd.h>
    21 #elif defined _XBOX
     22#elif _XBOX
    2223#   include <xtl.h>
    2324#   undef near /* Fuck Microsoft */
    2425#   undef far /* Fuck Microsoft again */
    2526#   include <xbox.h>
    26 #elif defined _WIN32
     27#elif _WIN32
    2728#   define WIN32_LEAN_AND_MEAN
    2829#   include <windows.h>
    29 #elif defined __CELLOS_LV2__
     30#elif __CELLOS_LV2__
    3031#   include <sys/sys_time.h>
    3132#   include <sys/timer.h>
    3233#   include <sys/time_util.h>
    33 #elif defined HAVE_SDL_SDL_H
     34#elif HAVE_SDL_SDL_H
    3435#   include <SDL/SDL.h>
    3536#else
     
    5657    }
    5758
    58 #if defined __linux__ || defined __native_client__ || defined __APPLE__
     59#if __linux__ || __native_client__ || __APPLE__ \
     60 || (HAVE_GETTIMEOFDAY && HAVE_USLEEP)
    5961    float GetSeconds(bool reset)
    6062    {
     
    7476    struct timeval m_tv;
    7577
    76 #elif defined _WIN32
     78#elif _WIN32
    7779    float GetSeconds(bool reset)
    7880    {
     
    100102    LARGE_INTEGER m_cycles;
    101103
    102 #elif defined __CELLOS_LV2__
     104#elif __CELLOS_LV2__
    103105    float GetSeconds(bool reset)
    104106    {
  • trunk/src/ticker.cpp

    r2620 r2624  
    423423}
    424424
     425void TickerData::DiskThreadTick()
     426{
     427    ;
     428}
     429
    425430void Ticker::SetState(Entity * /* entity */, uint32_t /* state */)
    426431{
Note: See TracChangeset for help on using the changeset viewer.