Changeset 150

Timestamp:

09/03/10 16:08:16 (17 months ago)

Author:

Carsten

Message:

Even more 64-bit Windows build fixes.
These changes complete the port of Cafu to 64-bit Windows! :-D

Location:

cafu/trunk

Files:

• Ca3DE/Cafu.rc (modified) (1 diff)
• CaWE/CaWE.rc (modified) (1 diff)
• Libs/Fonts/Font.cpp (modified) (1 diff)
• Libs/PlatformAux.cpp (modified) (3 diffs)
• SConscript (modified) (2 diffs)
• SConstruct (modified) (1 diff)

cafu/trunk/Ca3DE/Cafu.rc

@@ -39 +39 @@
         BEGIN
             VALUE "CompanyName", "Carsten Fuchs Software"
-            VALUE "FileDescription", "The Cafu Engine executable"
+            VALUE "FileDescription", "Cafu Engine"
             VALUE "FileVersion", "1.0.0.0"
             VALUE "InternalName", "Cafu"

cafu/trunk/CaWE/CaWE.rc

@@ -39 +39 @@
         BEGIN
             VALUE "CompanyName", "Carsten Fuchs Software"
-            VALUE "FileDescription", "The Cafu World Editor application"
+            VALUE "FileDescription", "CaWE - Cafu World Editor"
             VALUE "FileVersion", "1.0.0.0"
             VALUE "InternalName", "CaWE"

cafu/trunk/Libs/Fonts/Font.cpp

@@ -98 +98 @@
         const float Size  =16.0/256.0;
 
-        TextMesh.Vertices[4*c+0].SetOrigin( 0+c*10,  0); TextMesh.Vertices[4*c+0].SetTextureCoord(CoordX     , CoordY     );
-        TextMesh.Vertices[4*c+1].SetOrigin(16+c*10,  0); TextMesh.Vertices[4*c+1].SetTextureCoord(CoordX+Size, CoordY     );
-        TextMesh.Vertices[4*c+2].SetOrigin(16+c*10, 16); TextMesh.Vertices[4*c+2].SetTextureCoord(CoordX+Size, CoordY+Size);
-        TextMesh.Vertices[4*c+3].SetOrigin( 0+c*10, 16); TextMesh.Vertices[4*c+3].SetTextureCoord(CoordX     , CoordY+Size);
+        // Under the LLP64 data model, the 64-bit Windows compilers warn that the conversion from
+        // size_t to unsigned long and size_t to double loses data, thus cast c to unsigned int here.
+        const unsigned int i=(unsigned int)c;
+
+        TextMesh.Vertices[4*i+0].SetOrigin( 0+i*10,  0); TextMesh.Vertices[4*i+0].SetTextureCoord(CoordX     , CoordY     );
+        TextMesh.Vertices[4*i+1].SetOrigin(16+i*10,  0); TextMesh.Vertices[4*i+1].SetTextureCoord(CoordX+Size, CoordY     );
+        TextMesh.Vertices[4*i+2].SetOrigin(16+i*10, 16); TextMesh.Vertices[4*i+2].SetTextureCoord(CoordX+Size, CoordY+Size);
+        TextMesh.Vertices[4*i+3].SetOrigin( 0+i*10, 16); TextMesh.Vertices[4*i+3].SetTextureCoord(CoordX     , CoordY+Size);
     }
 

cafu/trunk/Libs/PlatformAux.cpp

@@ -182 +182 @@
     typedef MatSys::RendererI* (__stdcall *GetRendererT)(cf::ConsoleI* Console_, cf::FileSys::FileManI* FileMan_);
 
-    #ifdef _WIN32
+    #if defined(_WIN32) && !defined(_WIN64)
         GetRendererT GetRendererFunc=(GetRendererT)GetProcAddress(OutRendererDLL, "_GetRenderer@8");
     #else
@@ -279 +279 @@
     typedef MatSys::TextureMapManagerI* (__stdcall *GetTMMT)();
 
-    #ifdef _WIN32
+    #if defined(_WIN32) && !defined(_WIN64)
         GetTMMT GetTMM=(GetTMMT)GetProcAddress(RendererDLL, "_GetTextureMapManager@0");
     #else
@@ -308 +308 @@
     typedef SoundSysI* (__stdcall *GetSoundSys)(cf::ConsoleI* Console_, cf::FileSys::FileManI* FileMan_);
 
-    #ifdef _WIN32
+    #if defined(_WIN32) && !defined(_WIN64)
         GetSoundSys GetSoundSysFunc=(GetSoundSys)GetProcAddress(OutSoundSysDLL, "_GetSoundSys@8");
     #else

cafu/trunk/SConscript

@@ -63 +63 @@
     wxPath="#/ExtLibs/wxWidgets";
 
-    wxEnv.Append(CPPPATH=[wxPath+'/include'])
-    wxEnv.Append(LIBS=Split("advapi32 comctl32 comdlg32 gdi32 ole32 oleaut32 opengl32 rpcrt4 shell32 user32 winspool wsock32"))
-
     # TODO: Move this into the SConstruct file (including the wx include path above).
     #   Note that we only (want to) determine the right library path matching the used compiler here.
@@ -86 +83 @@
         wxEnv.Append(CPPPATH=[wxPath+LibPath+"/mswu"])
         wxEnv.Append(LIBS=Split("wxbase29u wxbase29u_net wxjpeg wxmsw29u_adv wxmsw29u_core wxmsw29u_gl wxmsw29u_aui wxmsw29u_propgrid wxregexu"))
+
+    wxEnv.Append(CPPPATH=[wxPath+'/include'])   # This must be appended *after* the LibPath-specific paths.
+    wxEnv.Append(LIBS=Split("advapi32 comctl32 comdlg32 gdi32 ole32 oleaut32 opengl32 rpcrt4 shell32 user32 winspool wsock32"))
 
 elif sys.platform=="linux2":

cafu/trunk/SConstruct

@@ -265 +265 @@
 # debug builds are available (i.e. the code below fails if neither "d" nor "r" is in BVs).
 if sys.platform=="win32":
-    envRelease.Install(".", ["#/ExtLibs/Cg/bin/cg.dll", "#/ExtLibs/Cg/bin/cgGL.dll"]);
-    envRelease.Install(".", ["#/ExtLibs/fmod/api/fmod.dll"]);
+    if envCommon["TARGET_ARCH"]=="x86":
+        envRelease.Install(".", ["#/ExtLibs/Cg/bin/cg.dll", "#/ExtLibs/Cg/bin/cgGL.dll"]);
+        envRelease.Install(".", ["#/ExtLibs/fmod/api/fmod.dll"]);
+    else:
+        envRelease.Install(".", ["#/ExtLibs/Cg/bin.x64/cg.dll", "#/ExtLibs/Cg/bin.x64/cgGL.dll"]);
+
     envRelease.Install(".", ["#/ExtLibs/openal-win/OpenAL32.dll", "#/ExtLibs/openal-win/wrap_oal.dll"]);