Changeset 16

Show
Ignore:
Timestamp:
06/07/04 01:08:30 (4 years ago)
Author:
aldacron
Message:

* added my own version of glConstants.d, and fixed glee.d so that there are no references to Derelict
* modified the Makefile for the new changes
* apparently, I also modified gl.d and glu.d, but I can't remember what changes I made!

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/DerelictGL/Makefile

    r15 r16  
    99    $(OGL.SRC.DIR)\gl.d \ 
    1010    $(OGL.SRC.DIR)\gltypes.d \ 
    11     $(SRC.DIR)\glee.d 
     11    $(SRC.DIR)\glee.d \ 
     12    $(SRC.DIR)\glConstants.d 
    1213     
    1314OGL.OBJ.DIR = $(OBJ.DIR)\opengl 
    …… 
    1516    $(OGL.OBJ.DIR)\gl.obj \ 
    1617    $(OGL.OBJ.DIR)\gltypes.obj \ 
    17     $(OGL.OBJ.DIR)\glee.obj    
     18    $(OGL.OBJ.DIR)\glee.obj \ 
     19    $(OGL.OBJ.DIR)\glConstants.obj    
    1820 
    19 # the version flag is here for so we can include gltypes rather than glconstants in glee.d 
    20 DFLAGS = -v -version=DerelictGL 
     21DFLAGS = -v 
    2122LIBFLAGS = -c        
    2223DINC = -I$(OGL.SRC.DIR) 

  • trunk/DerelictGL/README.GLEE

    r12 r16  
    1010* Removed unused types and those which are defined in std.c.windows.windows. 
    1111* Added a private import of std.c.windows.windows 
    12 * Made glee.d part of the derelict.opengl package 
    13 * Replaced the import of glconstants.d with my existing gltypes.d 
    1412* Added version statements where required 
     13 
     14I also replaced Joel's glConstants.d with a new version which imports derelict's 
     15gltypes (as per Joel's request). This allows me to include glee.d in the 
     16DerelictGL without adding any references to Derelict, and Joel and I can maintain 
     17concurrent versions. 
    1518 
    1619Note that the original glee.d and glconstants.d are not included in the glee 

  • trunk/DerelictGL/derelict/opengl/gl.d

    r15 r16  
    232232* going on. 
    233233*/ 
     234/* 
    234235static this() 
    235236{ 
    …… 
    237238    // dglLoad(); 
    238239} 
    239  
     240*/ 
    240241/*! 
    241242* Unloads the shared lib. 

  • trunk/DerelictGL/glee.d

    r15 r16  
    4949 
    5050private import std.c.windows.windows; 
    51  
    52 version(DerelictGL) 
    53 { 
    54 private import derelict.opengl.gltypes; 
    55 } 
    56 else 
    57 { 
    5851private import glConstants; 
    59 } 
     52 
    6053 
    6154extern (C) 

  • trunk/DerelictGLU/derelict/glu/glu.d

    r15 r16  
    140140    loadGLU(); 
    141141} 
     142 
     143static ~this() 
     144{ 
     145    unloadGLU(); 
     146} 
     147 
     148 
    142149//============================================================================== 
    143150// CONSTANTS