diff -ruN -x.hg -x build naev.orig/CMakeLists.txt naev/CMakeLists.txt --- naev.orig/CMakeLists.txt 1970-01-01 03:00:00.000000000 +0300 +++ naev/CMakeLists.txt 2009-01-17 03:19:28.000000000 +0300 @@ -0,0 +1,32 @@ +# +# CMakeLists.txt for NAEV by Dmitry Marakasov +# + +# main +PROJECT(naev) + +CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0) + +SET(VMAJOR 0) +SET(VMINOR 3) +SET(VREV 5) + +# options +SET(BINDIR "bin" CACHE STRING "Where to install binaries") +SET(DATAPATH "." CACHE STRING "Path to a directory where naev-${VMAJOR}-${VMINOR}-${VREV} datafile is located") + +# depends +FIND_PACKAGE(SDL REQUIRED) +FIND_PACKAGE(SDL_image REQUIRED) +FIND_PACKAGE(SDL_mixer REQUIRED) +FIND_PACKAGE(Freetype REQUIRED) +FIND_PACKAGE(PNG REQUIRED) +FIND_PACKAGE(LibXml2 REQUIRED) +FIND_PACKAGE(OpenGL REQUIRED) + +# subdirs +ADD_SUBDIRECTORY(lib/csparse) +ADD_SUBDIRECTORY(lib/lua) +ADD_SUBDIRECTORY(src) +ADD_SUBDIRECTORY(utils/mkspr) +ADD_SUBDIRECTORY(utils/pack) diff -ruN -x.hg -x build naev.orig/VERSION naev/VERSION --- naev.orig/VERSION 1970-01-01 03:00:00.000000000 +0300 +++ naev/VERSION 2008-11-25 02:10:52.000000000 +0300 @@ -0,0 +1 @@ +0.3.4 \ No newline at end of file diff -ruN -x.hg -x build naev.orig/lib/csparse/CMakeLists.txt naev/lib/csparse/CMakeLists.txt --- naev.orig/lib/csparse/CMakeLists.txt 1970-01-01 03:00:00.000000000 +0300 +++ naev/lib/csparse/CMakeLists.txt 2009-01-05 20:38:23.000000000 +0300 @@ -0,0 +1,4 @@ +# targets +FILE(GLOB csparse_SRCS *.c) + +ADD_LIBRARY(csparse STATIC ${csparse_SRCS}) diff -ruN -x.hg -x build naev.orig/lib/lua/CMakeLists.txt naev/lib/lua/CMakeLists.txt --- naev.orig/lib/lua/CMakeLists.txt 1970-01-01 03:00:00.000000000 +0300 +++ naev/lib/lua/CMakeLists.txt 2009-01-05 20:37:54.000000000 +0300 @@ -0,0 +1,4 @@ +# targets +FILE(GLOB lua_SRCS *.c) + +ADD_LIBRARY(lua STATIC ${lua_SRCS}) diff -ruN -x.hg -x build naev.orig/src/CMakeLists.txt naev/src/CMakeLists.txt --- naev.orig/src/CMakeLists.txt 1970-01-01 03:00:00.000000000 +0300 +++ naev/src/CMakeLists.txt 2009-01-17 03:20:16.000000000 +0300 @@ -0,0 +1,31 @@ +# targets +FILE(GLOB naev_SRCS *.c) + +INCLUDE_DIRECTORIES( + ../lib/csparse + ../lib/lua + ${FREETYPE_INCLUDE_DIR_freetype2} + ${FREETYPE_INCLUDE_DIR_ft2build} + ${LIBXML2_INCLUDE_DIR} + ${OPENGL_INCLUDE_DIR} + ${PNG_INCLUDE_DIR} + ${SDL_INCLUDE_DIR} +) + +ADD_DEFINITIONS(-DVMAJOR=${VMAJOR} -DVMINOR=${VMINOR} -DVREV=${VREV} -DNDATA_DEF=\"${DATAPATH}/ndata\") + +ADD_EXECUTABLE(naev ${naev_SRCS}) + +TARGET_LINK_LIBRARIES(naev + csparse + lua + ${FREETYPE_LIBRARIES} + ${LIBXML2_LIBRARIES} + ${OPENGL_gl_LIBRARY} + ${PNG_LIBRARIES} + ${SDLIMAGE_LIBRARY} + ${SDLMIXER_LIBRARY} + ${SDL_LIBRARY} +) + +INSTALL(TARGETS naev DESTINATION ${BINDIR}) diff -ruN -x.hg -x build naev.orig/src/nfile.c naev/src/nfile.c --- naev.orig/src/nfile.c 2009-01-17 03:31:55.000000000 +0300 +++ naev/src/nfile.c 2009-01-06 06:56:55.000000000 +0300 @@ -16,7 +16,7 @@ #include #include #include -#ifdef _POSIX_SOURCE +#ifndef WIN32 #include #include #include @@ -45,7 +45,7 @@ char *home; if (naev_base[0] == '\0') { -#if defined(LINUX) || defined(FREEBSD) +#ifndef WIN32 home = getenv("HOME"); snprintf(naev_base,PATH_MAX,"%s/.naev/",home); #else @@ -78,7 +78,7 @@ va_end(ap); } -#ifdef _POSIX_SOURCE +#ifndef WIN32 struct stat buf; stat(file,&buf); @@ -113,7 +113,7 @@ vsnprintf(file, PATH_MAX, path, ap); va_end(ap); } -#ifdef _POSIX_SOURCE +#ifndef WIN32 struct stat buf; if (stat(file,&buf)==0) /* stat worked, file must exist */ @@ -158,7 +158,7 @@ va_end(ap); } -#ifdef _POSIX_SOURCE +#ifndef WIN32 int i,j,k, n; DIR *d; struct dirent *dir; diff -ruN -x.hg -x build naev.orig/src/pack.c naev/src/pack.c --- naev.orig/src/pack.c 2009-01-17 03:31:55.000000000 +0300 +++ naev/src/pack.c 2009-01-06 07:07:24.000000000 +0300 @@ -49,7 +49,7 @@ * @brief Abstracts around packfiles. */ struct Packfile_s { -#ifdef _POSIX_SOURCE +#ifndef WIN32 int fd; /**< file descriptor */ #else /* not _POSIX_SOURCE */ FILE* fp; /**< For non-posix. */ @@ -66,7 +66,7 @@ * @brief Allows much faster creation of packfiles. */ struct Packcache_s { -#ifdef _POSIX_SOURCE +#ifndef WIN32 int fd; /**< file descriptor */ #else /* not _POSIX_SOURCE */ FILE* fp; /**< For non-posix. */ @@ -80,7 +80,7 @@ /* * Helper defines. */ -#ifdef _POSIX_SOURCE +#ifndef WIN32 #define READ(f,b,n) if (read((f)->fd,(b),(n))!=(n)) { \ ERR("Fewer bytes read then expected"); \ return NULL; } /**< Helper define to check for errors. */ @@ -144,7 +144,7 @@ /* * Open file. */ -#ifdef _POSIX_SOURCE +#ifndef WIN32 cache->fd = open( packfile, O_RDONLY ); if (cache->fd == -1) { #else /* not _POSIX_SOURCE */ @@ -204,7 +204,7 @@ /* * Close file. */ -#ifdef _POSIX_SOURCE +#ifndef WIN32 close( cache->fd ); #else /* not _POSIX_SOURCE */ fclose( cache->fp ); @@ -240,7 +240,7 @@ for (i=0; inindex; i++) { if (strcmp(cache->index[i], filename)==0) { /* Copy file. */ -#ifdef _POSIX_SOURCE +#ifndef WIN32 file->fd = dup(cache->fd); #else file->fp = cache->fp; @@ -252,7 +252,7 @@ /* Seek. */ if (file->start) { /* go to the beginning of the file */ -#ifdef _POSIX_SOURCE +#ifndef WIN32 if ((uint32_t)lseek( file->fd, file->start, SEEK_SET ) != file->start) { #else /* not _POSIX_SOURCE */ fseek( file->fp, file->start, SEEK_SET ); @@ -285,7 +285,7 @@ */ static off_t getfilesize( const char* filename ) { -#ifdef _POSIX_SOURCE +#ifndef WIN32 struct stat file; if (!stat( filename, &file )) @@ -321,7 +321,7 @@ buf = malloc(sizeof(magic)); -#ifdef _POSIX_SOURCE +#ifndef WIN32 int fd = open( filename, O_RDONLY ); if (fd == -1) { ERR("Erroring opening %s: %s", filename, strerror(errno)); @@ -360,7 +360,7 @@ } -#ifdef _POSIX_SOURCE +#ifndef WIN32 #define WRITE(b,n) if (write(outfd,b,n)==-1) { \ ERR("Error writing to file: %s", strerror(errno)); \ free(buf); return -1; } /**< Macro to help check for errors. */ @@ -380,7 +380,7 @@ int pack_files( const char* outfile, const char** infiles, const uint32_t nfiles ) { void *buf; -#ifdef _POSIX_SOURCE +#ifndef WIN32 struct stat file; int outfd, infd; #else /* _POSIX_SOURCE */ @@ -394,7 +394,7 @@ for (namesize=0,i=0; i < nfiles; i++) { /* make sure files exist before writing */ -#ifdef _POSIX_SOURCE +#ifndef WIN32 if (stat(infiles[i], &file)) { #else /* not _POSIX_SOURCE */ if (getfilesize(infiles[i]) == 0) { @@ -415,7 +415,7 @@ DEBUG("Index size is %d", indexsize ); /* creates the output file */ -#ifdef _POSIX_SOURCE +#ifndef WIN32 outfd = creat( outfile, PERMS ); if (outfd == -1) { #else /* not _POSIX_SOURCE */ @@ -455,7 +455,7 @@ WRITE( &bytes, 4 ); /* filesize */ DEBUG("About to write file '%s' of %d bytes", infiles[i], bytes); md5_init(&md5); -#ifdef _POSIX_SOURCE +#ifndef WIN32 infd = open( infiles[i], O_RDONLY ); while ((bytes = read( infd, buf, BLOCKSIZE ))) { #else /* not _POSIX_SOURCE */ @@ -467,7 +467,7 @@ } md5_finish(&md5, md5val); WRITE( md5val, 16 ); -#ifdef _POSIX_SOURCE +#ifndef WIN32 close(infd); #else /* not _POSIX_SOURCE */ fclose(inf); @@ -476,7 +476,7 @@ } free(md5val); -#ifdef _POSIX_SOURCE +#ifndef WIN32 close( outfd ); #else /* not _POSIX_SOURCE */ fclose( outf ); @@ -507,7 +507,7 @@ file = malloc(sizeof(Packfile_t)); memset( file, 0, sizeof(Packfile_t) ); -#ifdef _POSIX_SOURCE +#ifndef WIN32 file->fd = open( packfile, O_RDONLY ); if (file->fd == -1) { #else /* not _POSIX_SOURCE */ @@ -536,7 +536,7 @@ DEBUG("'%s' found at %d", filename, file->start); break; } -#ifdef _POSIX_SOURCE +#ifndef WIN32 lseek( file->fd, 4, SEEK_CUR ); /* ignore the file location */ #else /* not _POSIX_SOURCE */ fseek( file->fp, 4, SEEK_CUR ); @@ -544,7 +544,7 @@ } if (file->start) { /* go to the beginning of the file */ -#ifdef _POSIX_SOURCE +#ifndef WIN32 if ((uint32_t)lseek( file->fd, file->start, SEEK_SET ) != file->start) { #else /* not _POSIX_SOURCE */ fseek( file->fp, file->start, SEEK_SET ); @@ -585,7 +585,7 @@ count = file->end - file->pos; /* can't go past end */ if (count == 0) return 0; -#ifdef _POSIX_SOURCE +#ifndef WIN32 if ((bytes = read( file->fd, buf, count )) == -1) { #else /* not _POSIX_SOURCE */ if ((bytes = fread( buf, 1, count, file->fp)) == -1) { @@ -616,7 +616,7 @@ DEBUG("attempting to seek offset: %d, whence: %d", offset, whence); off_t ret; switch (whence) { -#ifdef _POSIX_SOURCE +#ifndef WIN32 case SEEK_SET: if ((file->start + offset) > file->end) return -1; ret = lseek( file->fd, file->start + offset, SEEK_SET ); @@ -706,7 +706,7 @@ md5_init(&md5); md5_append( &md5, buf, bytes ); md5_finish(&md5, md5val); -#ifdef _POSIX_SOURCE +#ifndef WIN32 if ((bytes = read( file->fd, md5fd, 16 )) == -1) #else /* not _POSIX_SOURCE */ if ((bytes = fread( md5fd, 1, 16, file->fp )) == -1) @@ -781,7 +781,7 @@ *nfiles = 0; -#ifdef _POSIX_SOURCE +#ifndef WIN32 file.fd = open( packfile, O_RDONLY ); if (file.fd == -1) { #else /* not _POSIX_SOURCE */ @@ -809,7 +809,7 @@ READ( &file, buf, 4 ); /* skip the location */ } free(buf); -#ifdef _POSIX_SOURCE +#ifndef WIN32 close(file.fd); #else /* not _POSIX_SOURCE */ fclose(file.fp); @@ -858,7 +858,7 @@ int i; /* Close files. */ -#ifdef _POSIX_SOURCE +#ifndef WIN32 i = close( file->fd ); #else /* not _POSIX_SOURCE */ if (file->flags & PACKFILE_FROMCACHE) diff -ruN -x.hg -x build naev.orig/src/rng.c naev/src/rng.c --- naev.orig/src/rng.c 2009-01-17 03:31:55.000000000 +0300 +++ naev/src/rng.c 2009-01-06 04:39:27.000000000 +0300 @@ -18,10 +18,10 @@ #include #include #include -#ifdef _POSIX_SOURCE +#ifndef WIN32 #include #include -#endif /* _POSIX_SOURCE */ +#endif /* WIN32 */ #include "SDL.h" #include "naev.h" @@ -58,7 +58,7 @@ int need_init; need_init = 1; /* initialize by default */ -#ifdef LINUX +#ifdef linux int fd; fd = open("/dev/urandom", O_RDONLY); /* /dev/urandom is better then time seed */ if (fd != -1) { @@ -92,16 +92,14 @@ static uint32_t rng_timeEntropy (void) { int i; -#if defined(_POSIX_SOURCE) +#ifndef WIN32 struct timeval tv; gettimeofday( &tv, NULL ); i = tv.tv_sec * 1000000 + tv.tv_usec; -#elif defined(WIN32) +#else struct _timeb tb; _ftime( &tb ); i = tb.time * 1000 + tb.millitm; -#else -#error "Needs implementation." #endif return i; } diff -ruN -x.hg -x build naev.orig/utils/mkspr/CMakeLists.txt naev/utils/mkspr/CMakeLists.txt --- naev.orig/utils/mkspr/CMakeLists.txt 1970-01-01 03:00:00.000000000 +0300 +++ naev/utils/mkspr/CMakeLists.txt 2009-01-06 04:15:57.000000000 +0300 @@ -0,0 +1,15 @@ +# targets +SET(mkspr_SRCS main.c) + +INCLUDE_DIRECTORIES( + ${SDL_INCLUDE_DIR} + ${PNG_INCLUDE_DIR} +) + +ADD_EXECUTABLE(mkspr ${mkspr_SRCS}) + +TARGET_LINK_LIBRARIES(mkspr + ${PNG_LIBRARIES} + ${SDLIMAGE_LIBRARY} + ${SDL_LIBRARY} +) diff -ruN -x.hg -x build naev.orig/utils/pack/CMakeLists.txt naev/utils/pack/CMakeLists.txt --- naev.orig/utils/pack/CMakeLists.txt 1970-01-01 03:00:00.000000000 +0300 +++ naev/utils/pack/CMakeLists.txt 2009-01-06 04:41:55.000000000 +0300 @@ -0,0 +1,12 @@ +# targets +SET(pack_SRCS + main.c + ../../src/pack.c + ../../src/md5.c +) + +INCLUDE_DIRECTORIES( + ../../src +) + +ADD_EXECUTABLE(pack ${pack_SRCS})