Changeset 138

Timestamp:

08/27/10 18:55:42 (18 months ago)

Author:

Carsten

Message:

Code enhancements for the native 64-bit Windows (LLP64) port.

Location:

cafu/trunk

Files:

• CaBSP/CaBSP.cpp (modified) (1 diff)
• CaLight/CaLight.cpp (modified) (1 diff)
• CaPVS/CaPVS.cpp (modified) (1 diff)
• CaSHL/CaSHL.cpp (modified) (1 diff)
• CaTools/CaSanity.cpp (modified) (1 diff)
• ExtLibs/freealut/SConscript (modified) (1 diff)
• Games/DeathMatch/Code/ScriptState.cpp (modified) (1 diff)
• Libs/MaterialSystem/Common/OpenGLEx.cpp (modified) (2 diffs)
• Libs/MaterialSystem/RendererARBprogs/Shaders/_CommonHelpers.cpp (modified) (2 diffs)
• SConscript (modified) (1 diff)

cafu/trunk/CaBSP/CaBSP.cpp

@@ -143 +143 @@
     {
         // Dateinamen abtrennen (mit Extension).
-        int i=strlen(WorldPathName)-1;
-
-        while (i>=0 && WorldPathName[i]!='/' && WorldPathName[i]!='\\') i--;
-        strncpy(WorldName, WorldPathName+i+1, 256);
+        size_t i=strlen(WorldPathName);
+
+        while (i>0 && WorldPathName[i-1]!='/' && WorldPathName[i-1]!='\\') i--;
+        strncpy(WorldName, WorldPathName+i, 256);
         WorldName[255]=0;
 
         // Extension abtrennen.
-        i=strlen(WorldName)-1;
-
-        while (i>=0 && WorldName[i]!='.') i--;
-        if (i>=0) WorldName[i]=0;
+        i=strlen(WorldName);
+
+        while (i>0 && WorldName[i-1]!='.') i--;
+        if (i>0) WorldName[i-1]=0;
     }
 

cafu/trunk/CaLight/CaLight.cpp

@@ -1306 +1306 @@
     {
         // Dateinamen abtrennen (mit Extension).
-        int i=strlen(WorldPathName)-1;
-
-        while (i>=0 && WorldPathName[i]!='/' && WorldPathName[i]!='\\') i--;
-        strncpy(WorldName, WorldPathName+i+1, 256);
+        size_t i=strlen(WorldPathName);
+
+        while (i>0 && WorldPathName[i-1]!='/' && WorldPathName[i-1]!='\\') i--;
+        strncpy(WorldName, WorldPathName+i, 256);
         WorldName[255]=0;
 
         // Extension abtrennen.
-        i=strlen(WorldName)-1;
-
-        while (i>=0 && WorldName[i]!='.') i--;
-        if (i>=0) WorldName[i]=0;
+        i=strlen(WorldName);
+
+        while (i>0 && WorldName[i-1]!='.') i--;
+        if (i>0) WorldName[i-1]=0;
     }
 

cafu/trunk/CaPVS/CaPVS.cpp

@@ -743 +743 @@
     {
         // Dateinamen abtrennen (mit Extension).
-        int i=strlen(WorldPathName)-1;
-
-        while (i>=0 && WorldPathName[i]!='/' && WorldPathName[i]!='\\') i--;
-        strncpy(WorldName, WorldPathName+i+1, 256);
+        size_t i=strlen(WorldPathName);
+
+        while (i>0 && WorldPathName[i-1]!='/' && WorldPathName[i-1]!='\\') i--;
+        strncpy(WorldName, WorldPathName+i, 256);
         WorldName[255]=0;
 
         // Extension abtrennen.
-        i=strlen(WorldName)-1;
-
-        while (i>=0 && WorldName[i]!='.') i--;
-        if (i>=0) WorldName[i]=0;
+        i=strlen(WorldName);
+
+        while (i>0 && WorldName[i-1]!='.') i--;
+        if (i>0) WorldName[i-1]=0;
     }
 

cafu/trunk/CaSHL/CaSHL.cpp

@@ -1093 +1093 @@
     {
         // Dateinamen abtrennen (mit Extension).
-        int i=strlen(WorldPathName)-1;
-
-        while (i>=0 && WorldPathName[i]!='/' && WorldPathName[i]!='\\') i--;
-        strncpy(WorldName, WorldPathName+i+1, 256);
+        size_t i=strlen(WorldPathName);
+
+        while (i>0 && WorldPathName[i-1]!='/' && WorldPathName[i-1]!='\\') i--;
+        strncpy(WorldName, WorldPathName+i, 256);
         WorldName[255]=0;
 
         // Extension abtrennen.
-        i=strlen(WorldName)-1;
-
-        while (i>=0 && WorldName[i]!='.') i--;
-        if (i>=0) WorldName[i]=0;
+        i=strlen(WorldName);
+
+        while (i>0 && WorldName[i-1]!='.') i--;
+        if (i>0) WorldName[i-1]=0;
     }
 

cafu/trunk/CaTools/CaSanity.cpp

@@ -103 +103 @@
     {
         // Dateinamen abtrennen (mit Extension).
-        int i=strlen(WorldPathName)-1;
-
-        while (i>=0 && WorldPathName[i]!='/' && WorldPathName[i]!='\\') i--;
-        strncpy(WorldName, WorldPathName+i+1, 256);
+        size_t i=strlen(WorldPathName);
+
+        while (i>0 && WorldPathName[i-1]!='/' && WorldPathName[i-1]!='\\') i--;
+        strncpy(WorldName, WorldPathName+i, 256);
         WorldName[255]=0;
 
         // Extension abtrennen.
-        i=strlen(WorldName)-1;
-
-        while (i>=0 && WorldName[i]!='.') i--;
-        if (i>=0) WorldName[i]=0;
+        i=strlen(WorldName);
+
+        while (i>0 && WorldName[i-1]!='.') i--;
+        if (i>0) WorldName[i-1]=0;
     }
 

cafu/trunk/ExtLibs/freealut/SConscript

@@ -10 +10 @@
     env_freealut.Append(CPPDEFINES=['_WINDOWS', '_USRDLL', 'ALUT_EXPORTS', 'WIN32', '_MBCS', 'ALUT_BUILD_LIBRARY', 'HAVE__STAT', 'HAVE_BASETSD_H', 'HAVE_SLEEP', 'HAVE_WINDOWS_H'])
     env_freealut.Append(CPPPATH=['include', '#/ExtLibs/openal-win/include'])
-    env_freealut.Append(LIBPATH=['#/ExtLibs/openal-win/libs/Win32'])
+    if env_freealut["TARGET_ARCH"]=="x86":
+        env_freealut.Append(LIBPATH=['#/ExtLibs/openal-win/libs/Win32'])
+    else:
+        env_freealut.Append(LIBPATH=['#/ExtLibs/openal-win/libs/Win64'])
     env_freealut.Append(LIBS=Split("OpenAL32"))
 

cafu/trunk/Games/DeathMatch/Code/ScriptState.cpp

@@ -509 +509 @@
     }
 
-    const int ResCount=strlen(Results);
+    const int ResCount=int(strlen(Results));
 
 

cafu/trunk/Libs/MaterialSystem/Common/OpenGLEx.cpp

@@ -54 +54 @@
 {
     // Dies ist im wesentlichen der Code aus dem "OpenGL Programming Guide", Seite 568.
-    int   LengthOfExtName=strlen(ExtensionName);
-    char* Extensions     =(char*)glGetString(GL_EXTENSIONS);
+    const size_t LengthOfExtName=strlen(ExtensionName);
+    char*        Extensions     =(char*)glGetString(GL_EXTENSIONS);
 
     if (Extensions==NULL) return false;
@@ -63 +63 @@
     while (Extensions<End)
     {
-        const int n=strcspn(Extensions, " ");
+        const size_t n=strcspn(Extensions, " ");
 
         if (LengthOfExtName==n && strncmp(ExtensionName, Extensions, n)==0) return true;

cafu/trunk/Libs/MaterialSystem/RendererARBprogs/Shaders/_CommonHelpers.cpp

@@ -43 +43 @@
 
     // Upload the string (code) for this program.
-    cf::glProgramStringARB(ProgramTarget, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(ProgramCode), ProgramCode);
+    cf::glProgramStringARB(ProgramTarget, GL_PROGRAM_FORMAT_ASCII_ARB, GLsizei(strlen(ProgramCode)), ProgramCode);
 
 
@@ -55 +55 @@
 #ifdef DEBUG
     // Want to see warning messages in debug builts.
-    const int ErrorStringLen=strlen(ErrorString);
+    const size_t ErrorStringLen=strlen(ErrorString);
 #else
     // ...and currently in release builts, too.
-    const int ErrorStringLen=strlen(ErrorString);
+    const size_t ErrorStringLen=strlen(ErrorString);
  // const int ErrorStringLen=0;
 #endif

cafu/trunk/SConscript

@@ -57 +57 @@
                        + Split("GL GLU"))
 
-envTools.Program('CaSanity', ['CaTools/CaSanity.cpp'] + CommonWorldObject)
-
 envTools.Program("MakeFont", "CaTools/MakeFont.cpp", LIBS=envTools["LIBS"]+["freetype"])
 
-envTools.Program('MaterialViewer', "CaTools/MaterialViewer.cpp")
-
-envTools.Program('ModelViewer', "CaTools/ModelViewer.cpp")
-
-envTools.Program('TerrainViewer', "CaTools/TerrainViewer.cpp", CPPPATH=envTools["CPPPATH"]+["ExtLibs/zlib"])
-
-envTools.Program('TerrainViewerOld', "CaTools/TerrainViewerOld.cpp")
+if sys.platform!="win32" or envTools["TARGET_ARCH"]=="x86":
+    # Don't build these programs under 64-bit Windows, as they still depend on our legacy 32-bit-only DirectInput code.
+    envTools.Program('CaSanity', ['CaTools/CaSanity.cpp'] + CommonWorldObject)
+    envTools.Program('MaterialViewer', "CaTools/MaterialViewer.cpp")
+    envTools.Program('ModelViewer', "CaTools/ModelViewer.cpp")
+    envTools.Program('TerrainViewer', "CaTools/TerrainViewer.cpp", CPPPATH=envTools["CPPPATH"]+["ExtLibs/zlib"])
+    envTools.Program('TerrainViewerOld', "CaTools/TerrainViewerOld.cpp")
 
 if sys.platform=="win32":