Changeset 108 for trunk/orca

Timestamp:

04/05/06 14:24:49 (3 years ago)

Author:

krobillard

Message:

Orca-GL should now build on Windows.

Location:

trunk/orca

Files:

• gl/project.r (modified) (1 diff)
• gl/ttf_load.c (modified) (4 diffs)
• ovalue.c (modified) (1 diff)
• qt/main.cpp (modified) (1 diff)
• qt/project.r (modified) (1 diff)
• win32/win32console.c (moved) (moved from trunk/orca/qt/win32console.cpp)

trunk/orca/gl/project.r

@@ -50 +50 @@
     ]
     win32 [
+        lib-path: %"C:/cygwin/home/karl/osrc/"
+
         include_from %glv/win32
         sources [%glv/win32/glv.c]
 
         include_from %../win32
-        sources [ %win32console.c ]
+        sources_from %../win32 [%win32console.c]
 
-        include_from %../../../osrc/freetype2/include
-        libs_from %../../../osrc/freetype2/objs [%freetype]
+        include_from join lib-path %freetype2/include
+        libs_from join lib-path %freetype2/objs [%freetype]
 
-        include_from %../../../osrc/lpng128
-        include_from %../../../osrc/zlib
-        libs_from %../../../osrc/lpng128 [%libpng]
-        libs_from %../../../osrc/zlib [%zlib]
+        include_from join lib-path %lpng128
+        include_from join lib-path %zlib
+        libs_from join lib-path %lpng128 [%libpng]
+        libs_from join lib-path %zlib [%zlib]
 
         include_from %"C:/Program Files/OpenAL 1.1 SDK/include"

trunk/orca/gl/ttf_load.c

@@ -332 +332 @@
     OArray kern;
 #endif
+    const char* ci;
     int count = 0;
     int fail = 0;
@@ -394 +395 @@
     y = step_y;
 
-    const char* ci = codes;
+    ci = codes;
     for( ci = codes; *ci != '\0'; ++ci )
     {
@@ -407 +408 @@
         if( ! error )
         {
+            TexGlyphInfo* tgi;
             int nextX = x + FT_PIXELS(glyph->metrics.width) + gap;
 
@@ -426 +428 @@
             renderGlyph( img, glyph, x, y, ! asBitmap );
 
-            TexGlyphInfo* tgi = txf->tgi + count;
+            tgi = txf->tgi + count;
             count++;
 

trunk/orca/ovalue.c

@@ -1236 +1236 @@
 
 
-OR_NATIVE( orLoadNative )
+/* Public because of Orca-GL */
+OR_NATIVE_PUB( orLoadNative )
 {
     OBlock* blk;

trunk/orca/qt/main.cpp

@@ -26 +26 @@
 
 #ifdef _WIN32
-extern void redirectIOToConsole();
+extern "C" void redirectIOToConsole();
 #define OPEN_CONSOLE    redirectIOToConsole();
 #else

trunk/orca/qt/project.r

@@ -25 +25 @@
     win32 [
         include_from %../win32
-        sources [ %win32console.cpp ]
+        sources_from %../win32 [ %win32console.c ]
     ]