Changeset 227

Timestamp:

03/18/08 12:47:38 (4 months ago)

Author:

timo

Message:

fix windows compile, it's possible the linux build broke and will need misc tweaks. you need a new GtkR-1.6-deps.zip

Files:

• GtkRadiant/branches/ZeroRadiant/libs/missing.h (modified) (4 diffs)
• GtkRadiant/branches/ZeroRadiant/plugins/image/bmp.h (modified) (2 diffs)
• GtkRadiant/branches/ZeroRadiant/plugins/image/image.vcproj (modified) (2 diffs)
• GtkRadiant/branches/ZeroRadiant/plugins/image/jpeg.cpp (modified) (1 diff)
• GtkRadiant/branches/ZeroRadiant/radiant/missing.cpp (modified) (4 diffs)
• GtkRadiant/branches/ZeroRadiant/radiant/preferences.cpp (modified) (1 diff)
• GtkRadiant/branches/ZeroRadiant/radiant/radiant.vcproj (modified) (2 diffs)
• GtkRadiant/branches/ZeroRadiant/tools/quake3/common/imagelib.h (modified) (1 diff)
• GtkRadiant/branches/ZeroRadiant/tools/quake3/q3map2/q3map2.vcproj (modified) (2 diffs)

GtkRadiant/branches/ZeroRadiant/libs/missing.h

@@ -35 +35 @@
-//   this goes along with str.h and provides various utility classes
-//   and portability defines
-name is a lege
+ name (missing.h) is a lega
-//   in a central 'portability' lib
-
@@ -42 +42 @@
-
-#ifdef _WIN32
+
+#include <windows.h>
-#include <direct.h>
-#include <io.h>
-
-
-
-
+
+
+
-#define R_OK 04
-
-
-
-
-
-
-
-
-
-
+
+
-
-// LZ: very ugly hacks
- 
+
-
-// temp stuff
@@ -67 +60 @@
-#define VERIFY(a) a;
-int GetFullPathName(const char *lpFileName, int nBufferLength, char *lpBuffer, char **lpFilePart);
-bool CopyFile(const char *lpExistingFileName, const char *lpNewFileName);
-bool CopyTree( const char* source, const char* dest );
-
-#ifndef APIENTRY
@@ -211 +202 @@
-};
-
+class FindFiles {
+public:
+        FindFiles( const char *directory );
+        ~FindFiles();
+
+        const char* NextFile();
+private:
+#ifdef _WIN32
+        Str                             directory;
+        HANDLE                  findHandle;
+        WIN32_FIND_DATA findFileData;
+#else
+#endif
+};
+
+bool CopyTree( const char* source, const char* dest );
+
+typedef enum {
+        PATH_FAIL,              // stat call failed (does not exist is likely)
+        PATH_DIRECTORY,
+        PATH_FILE
+} EPathCheck;
+
+// check a path for existence, return directory / file
+EPathCheck CheckFile( const char *path );
+
+bool radCreateDirectory( const char *directory );
+bool radCopyFile( const char *lpExistingFileName, const char *lpNewFileName );
+
-#endif // _MISSING_H_

GtkRadiant/branches/ZeroRadiant/plugins/image/bmp.h

@@ -30 +30 @@
-#define BMP_SIGNATURE_WORD  0x4d42
-
+#pragma pack(push)
-#pragma pack(1)
-
-
-
-typedef struct {
@@ -97 +96 @@
-void NewBMP(int width, int height, int bpp, bitmap_t *bit);
-
-
+
-
-#endif

GtkRadiant/branches/ZeroRadiant/plugins/image/image.vcproj

@@ -1 @@
-
+
+
+
+
+
+
+
+
-        <Platforms>
-
+
+
+
-        </Platforms>
-        <ToolFiles>
-        </ToolFiles>
-        <Configurations>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                </Configuration>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                </Configuration>
-        </Configurations>
@@ -50 +173 @@
-        </References>
-        <Files>
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        </File>
-                </Filter>
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        </File>
-                </Filter>
-
+
+
+
+
-                </Filter>
-        </Files>

GtkRadiant/branches/ZeroRadiant/plugins/image/jpeg.cpp

@@ -35 +35 @@
-//
-
+#include <stdio.h>
-#include <setjmp.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <glib.h>
-
+extern "C" {
-#include <jpeglib.h>
-#include <jerror.h>
+}
-
-#include "image.h"

GtkRadiant/branches/ZeroRadiant/radiant/missing.cpp

@@ -35 +35 @@
-//
-
-
+
+
+
-#if defined (__linux__) || defined (__APPLE__)
-
@@ -45 +47 @@
-#include <stdlib.h>
-#include <dirent.h>
-
-
-
-
+
+
-{
-  FILE *src, *dst;
@@ -86 +86 @@
-}
-
-
+rad
-        if ( mkdir( directory, 0777 ) == -1 ) {
-                Sys_Printf( "mkdir %s failed\n", directory );
-                return false;
-        }
-        return true;
-}
-
-bool CopyTree( const char *source, const char *dest ) {
-        DIR                             *dir;
-        struct dirent   *dirlist;
-        struct stat             sbuf;
-        Str                             srcEntry;
-        Str                             dstEntry;
-
-        dir = opendir( source );
-        if ( dir != NULL ) {
-                while ( ( dirlist = readdir( dir ) ) != NULL ) {
-                        if ( strcmp( dirlist->d_name, "." ) == 0 || strcmp( dirlist->d_name, ".." ) == 0 ) {
-                                continue;
-                        }
-                        if ( strcmp( dirlist->d_name, ".svn" ) == 0 ) {
-                                continue;
-                        }
-                        srcEntry = source;
-                        srcEntry += "/";
-                        srcEntry += dirlist->d_name;
-                        dstEntry = dest;
-                        dstEntry += "/";
-                        dstEntry += dirlist->d_name;
-                        if ( stat( srcEntry.GetBuffer(), &sbuf ) == -1 ) {
-                                Sys_Printf( "stat %s failed\n", srcEntry.GetBuffer() );
-                        }
-                        if ( S_ISDIR( sbuf.st_mode ) ) {
-                                bool ret;
-                                if ( stat( dstEntry.GetBuffer(), &sbuf ) == -1 ) {
-                                        ret = CreateDirectory( dstEntry.GetBuffer() );
-                                }
-                                ret = CopyTree( srcEntry.GetBuffer(), dstEntry.GetBuffer() );
-                                if ( !ret ) {
-                                        return false;
-                                }
-                        } else {
-                                Sys_Printf( "copy %s -> %s\n", srcEntry.GetBuffer(), dstEntry.GetBuffer() );
-                                bool ret = CopyFile( srcEntry.GetBuffer(), dstEntry.GetBuffer() );
-                                if ( !ret ) {
-                                        return false;
-                                }
-                        }
-                }
-                closedir( dir );
-        }
-        return true;
@@ -179 +132 @@
-}
-
+EPathCheck CheckFile( const char *path ) {
+        struct stat             sbuf;
+        if ( stat( path, &sbuf ) == -1 ) {
+                return PATH_FAIL;
+        }
+        if ( S_ISDIR( sbuf.st_mode ) ) {
+                return PATH_DIRECTORY;
+        }
+        return PATH_FILE;
+}
+
+#else
+
+FindFiles::FindFiles( const char *_directory ) {
+        directory = _directory;
+        findHandle = INVALID_HANDLE_VALUE;
+}
+
+FindFiles::~FindFiles() {
+        if ( findHandle != NULL ) {
+                FindClose( findHandle );
+        }
+}
+
+const char* FindFiles::NextFile() {
+        if ( findHandle == INVALID_HANDLE_VALUE ) {
+                findHandle = FindFirstFile( directory.GetBuffer(), &findFileData );
+                if ( findHandle == INVALID_HANDLE_VALUE ) {
+                        return NULL;
+                }
+                return findFileData.cFileName;
+        }
+        if ( FindNextFile( findHandle, &findFileData ) == 0 ) {
+                FindClose( findHandle );
+                return NULL;
+        }
+        return findFileData.cFileName;
+}
+
+EPathCheck CheckFile( const char *path ) {
+        struct _stat sbuf;
+        if ( _stat( path, &sbuf ) == -1 ) {
+                return PATH_FAIL;
+        }
+        if ( ( sbuf.st_mode & _S_IFDIR ) != 0 ) {
+                return PATH_DIRECTORY;
+        }
+        return PATH_FILE;
+}
+
+bool radCreateDirectory( const char *directory ) {
+        return CreateDirectory( directory, NULL );
+}
+
+bool radCopyFile( const char *lpExistingFileName, const char *lpNewFileName ) {
+        return CopyFile( lpExistingFileName, lpNewFileName, FALSE );
+}
+
-#endif
+
+bool CopyTree( const char *source, const char *dest ) {
+        Str                             srcEntry;
+        Str                             dstEntry;
+        const char              *dirname;
+        FindFiles               fileScan( source );
+
+        while ( ( dirname = fileScan.NextFile() ) != NULL ) {
+                if ( strcmp( dirname, "." ) == 0 || strcmp( dirname, ".." ) == 0 ) {
+                        continue;
+                }
+                if ( strcmp( dirname, ".svn" ) == 0 ) {
+                        continue;
+                }
+                srcEntry = source;
+                srcEntry += "/";
+                srcEntry += dirname;
+                dstEntry = dest;
+                dstEntry += "/";
+                dstEntry += dirname;
+                switch ( CheckFile( srcEntry.GetBuffer() ) ) {
+                        case PATH_DIRECTORY: {
+                                if ( CheckFile( dstEntry.GetBuffer() ) == PATH_FAIL ) {
+                                        radCreateDirectory( dstEntry.GetBuffer() );
+                                }
+                                bool ret;
+                                ret = CopyTree( srcEntry.GetBuffer(), dstEntry.GetBuffer() );
+                                if ( !ret ) {
+                                        return false;
+                                }
+                                break;
+                        }
+                        case PATH_FILE: {
+                                Sys_Printf( "copy %s -> %s\n", srcEntry.GetBuffer(), dstEntry.GetBuffer() );
+                                bool ret = radCopyFile( srcEntry.GetBuffer(), dstEntry.GetBuffer() );
+                                if ( !ret ) {
+                                        return false;
+                                }
+                                break;
+                        }
+                }
+        }
+        return true;
+}

GtkRadiant/branches/ZeroRadiant/radiant/preferences.cpp

@@ -3283 +3283 @@
-void CGameInstall::ScanGames() {
-        Str                             pakPaths = g_strAppPath.GetBuffer();
-        DIR                             *dir;
-        struct dirent   *dirlist;
-        int                             iGame = 0;
+        const char              *dirname;
-
-        pakPaths +=     "installs/";
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-                }
-
+
+
+
-        }
-}
+

GtkRadiant/branches/ZeroRadiant/radiant/radiant.vcproj

@@ -1 @@
-
+
+
+
+
+
+
+
+
-        <Platforms>
-
+
+
+
-        </Platforms>
-        <ToolFiles>
-        </ToolFiles>
-        <Configurations>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+