Changeset 396 for ps

Timestamp:

06/04/04 14:41:53 (21 years ago)

Author:

janwas

Message:

(re)added headers so it'll work without HAVE_PCH

Location:

ps/trunk/source/lib

Files:

• adts.h (modified) (1 diff)
• config.h (modified) (2 diffs)
• input.cpp (modified) (1 diff)
• lib.cpp (modified) (1 diff)
• ogl.cpp (modified) (1 diff)
• precompiled.h (modified) (2 diffs)
• res/file.cpp (modified) (1 diff)
• res/font.cpp (modified) (1 diff)
• res/h_mgr.cpp (modified) (1 diff)
• res/mem.cpp (modified) (1 diff)
• res/tex.cpp (modified) (1 diff)
• res/vfs.cpp (modified) (1 diff)
• res/zip.cpp (modified) (1 diff)
• sysdep/ia32.cpp (modified) (1 diff)
• sysdep/win/waio.cpp (modified) (1 diff)
• sysdep/win/wdetect.cpp (modified) (1 diff)
• sysdep/win/win.cpp (modified) (1 diff)
• sysdep/win/wposix.cpp (modified) (1 diff)
• sysdep/win/wsdl.cpp (modified) (5 diffs)
• sysdep/win/wsock.cpp (modified) (1 diff)
• sysdep/win/wtime.cpp (modified) (1 diff)
• timer.cpp (modified) (1 diff)

ps/trunk/source/lib/adts.h

@@ -2 +2 @@
 #define ADTS_H__
 
-#include "precompiled.h"
-
 #include "lib.h"
 
-
 #include <cassert>
 
+#include <list>
+#include <map>
 
 

ps/trunk/source/lib/config.h

@@ -21 +21 @@
 #undef HAVE_X
 
+#undef HAVE_PCH
+
 #undef CONFIG_DISABLE_EXCEPTIONS
 
@@ -30 +32 @@
 #ifdef _MSC_VER
 # define HAVE_ASM
+//# define HAVE_PCH
 #endif
 

ps/trunk/source/lib/input.cpp

@@ -22 +22 @@
 
 #include "input.h"
+
+#include <stdio.h>
+#include <stdlib.h>
 
 

ps/trunk/source/lib/lib.cpp

@@ -21 +21 @@
 
 #include "sdl.h"    // endian functions
+
+#include <assert.h>
 
 

ps/trunk/source/lib/ogl.cpp

@@ -5 +5 @@
 #include "ogl.h"
 #include "detect.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
 
 #ifdef _MSC_VER

ps/trunk/source/lib/precompiled.h

@@ +1 @@
+// if precompiled headers are supported, include all headers we'd ever need
+// that don't often change. if not supported, include nothing (would actually
+// slow down the build, since unnecessary headers would be included).
+// hence, all files include precompiled.h and then all the headers they'd
+// normally lead => best build performance with or without PCH.
+
+#include "config.h"
+
+#ifdef _MSC_VER
+#pragma warning(disable:4996)   // function is deprecated
+#pragma warning(disable:4786)   // identifier truncated to 255 chars
+#endif
+
+#ifdef HAVE_PCH
+
 #include <string.h>
 #include <stdlib.h>
@@ -22 +37 @@
 #include <numeric>
 
-#ifdef _MSC_VER
-#pragma warning(disable:4996)   // function is deprecated
-#pragma warning(disable:4786)   // identifier truncated to 255 chars
 #endif
 
-#include "config.h"
+
+

ps/trunk/source/lib/res/file.cpp

@@ -27 +27 @@
 #include "adts.h"
 
+#include <vector>
+#include <algorithm>
 
 // block := power-of-two sized chunk of a file.

ps/trunk/source/lib/res/font.cpp

@@ -24 +24 @@
 #include "res.h"
 #include "ogl.h"
+
+#include <string.h>
+#include <stdio.h>
 
 /*

ps/trunk/source/lib/res/h_mgr.cpp

@@ -23 +23 @@
 #include "mem.h"
 
-// TODO: h_find - required for caching
-
-
-
-
-
+#include <assert.h>
+#include <limits.h> // CHAR_BIT
+#include <string.h>
+#include <stdlib.h>
 
 

ps/trunk/source/lib/res/mem.cpp

@@ -7 +7 @@
 #include "h_mgr.h"
 
+#include <stdlib.h>
+#include <assert.h>
+
+#include <map>
 
 //////////////////////////////////////////////////////////////////////////////

ps/trunk/source/lib/res/tex.cpp

@@ -24 +24 @@
 #include "res.h"
 #include "ogl.h"
+
+#include <math.h>
+#include <stdlib.h>
+#include <assert.h>
 
 

ps/trunk/source/lib/res/vfs.cpp

@@ -23 +23 @@
 #include "res.h"
 #include "adts.h"
+
+#include <string.h>
+
+#include <map>
+#include <list>
+#include <vector>
+#include <string>
+#include <algorithm>
 
 

ps/trunk/source/lib/res/zip.cpp

@@ -21 +21 @@
 #include "lib.h"
 #include "res.h"
+
+#include <assert.h>
 
 // provision for removing all ZLib code (all inflate calls will fail).

ps/trunk/source/lib/sysdep/ia32.cpp

@@ -29 +29 @@
 #include "win/wtime.h"
 #endif
+
+#include <assert.h>
+#include <string.h>
+#include <stdio.h>
+
+#include <vector>
+#include <algorithm>
 
 

ps/trunk/source/lib/sysdep/win/waio.cpp

@@ -19 +19 @@
 #include "precompiled.h"
 
-#include <io.h>
-
 #include "lib.h"
 #include "win_internal.h"
+
+#include <io.h>
+
+#include <assert.h>
+#include <stdlib.h>
 
 

ps/trunk/source/lib/sysdep/win/wdetect.cpp

@@ -23 +23 @@
 
 #include "win_internal.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 #ifdef _MSC_VER

ps/trunk/source/lib/sysdep/win/win.cpp

@@ -22 +22 @@
 
 #include <crtdbg.h> // malloc debug
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h> // __argc
 #include <malloc.h>
-
 
 //

ps/trunk/source/lib/sysdep/win/wposix.cpp

@@ -21 +21 @@
 #include "precompiled.h"
 
-#include <process.h>
-
 #include "lib.h"
 #include "win_internal.h"
+
+#include <process.h>
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 

ps/trunk/source/lib/sysdep/win/wsdl.cpp

@@ -35 +35 @@
 #include <SDL_vkeys.h>
 
+#include <assert.h>
+#include <stdio.h>
+#include <math.h>
+
 #ifdef _MSC_VER
 #pragma comment(lib, "user32.lib")
@@ -244 +248 @@
 
             ev->type = SDL_KEYDOWN;
-            ev->key.keysym.sym = (SDLKey)translated_keysym;
+            //ev->key.keysym.sym = (SDLKey)translated_keysym;
+            ev->key.keysym.sym = (SDLKey)((c < 256)? c : 0);
             ev->key.keysym.unicode = c;
             return 1;
@@ -278 +283 @@
                 // Translation complete: Produce one or more Unicode chars
                 char_buf[num_chars]=0;
-                translated_keysym=vkmap(vk);
+                ///translated_keysym=vkmap(vk);
                 //wprintf(L"ToUnicode: Translated %02x to [%s], %d chars, SDLK %02x. Extended flag %d, scancode %d\n", vk, char_buf, num_chars, translated_keysym, msg.lParam & 0x01000000, scancode);
-                //fflush(stdout);
                 goto return_char;
             }
@@ -287 +291 @@
                 // Dead Key: Don't produce an event for this one
                 //printf("ToUnicode: Dead Key %02x [%c] [%c] SDLK %02x\n", vk, vk, char_buf[0], vkmap(vk));
-                //fflush(stdout);
                 num_chars = 0;
                 break;
@@ -302 +305 @@
 
             //printf("ToUnicode: No translation for %02x, extended flag %d, scancode %d, SDLK %02x [%c]\n", vk, msg.lParam & 0x01000000, scancode, ev->key.keysym.sym, ev->key.keysym.sym);
-            //fflush(stdout);
 
             return 1;

ps/trunk/source/lib/sysdep/win/wsock.cpp

@@ -22 +22 @@
 #include "wsock.h"
 
+#include <assert.h>
+
+#ifdef _MSC_VER
 #pragma comment(lib, "ws2_32.lib")
+#endif
 
 

ps/trunk/source/lib/sysdep/win/wtime.cpp

@@ -24 +24 @@
 
 #include "win_internal.h"
+
+#include <math.h>
+
+#include <algorithm>
+#include <numeric>
+
 
 // we no longer use TGT, due to issues on Win9x; GTC is just as good.

ps/trunk/source/lib/timer.cpp

@@ -21 +21 @@
 #include "timer.h"
 
+#include <math.h>
 
 // wrapper over gettimeofday, instead of emulating it for Windows,