Changeset 33

Show
Ignore:
Timestamp:
07/22/04 13:50:54 (4 years ago)
Author:
aldacron
Message:

* initial checkin of DerelictPY
* fixed a bug in DerelictGL - I had changed the name of the internal loadGL function rather than dglLoad by mistake in the last update - dlgLoad is now DerelictGL_Load as it should be and the world is in harmony once more
* minor adjustment to all of the makefiles to make maintenance a wee bit easier - all library variables (such as SDL.LIB) now include the .lib extension in the value (i.e. 'SDL.LIB = derelictSDL.lib') - before I was using $(SDL.LIB).lib in multiple places - this applies to all packages and not just SDL
* changed the 'lib_noglee' make target to 'noglee' for the GL package and updated the GL README to reflect it

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/DerelictGL/Makefile

    r31 r33  
    2828    $(OGL.OBJ.DIR)\glConstants.obj  
    2929     
    30 OGL.LIB = $(LIB.DIR)\derelictGL 
     30OGL.LIB = $(LIB.DIR)\derelictGL.lib 
    3131 
    3232DEFAULT: lib 
    …… 
    3939     
    4040clean_lib: 
    41     @del $(OGL.LIB).lib 
     41    @del $(OGL.LIB) 
    4242 
    4343clean: clean_globj clean_gleeobj     
    …… 
    5454 
    5555lib_gl: 
    56     lib $(LIBFLAGS) $(OGL.LIB).lib $(OGL.OBJ) 
     56    lib $(LIBFLAGS) $(OGL.LIB) $(OGL.OBJ) 
    5757     
    5858lib_glglee: 
    59     lib $(LIBFLAGS) $(OGL.LIB).lib $(OGL.OBJ) $(GLEE.OBJ) 
     59    lib $(LIBFLAGS) $(OGL.LIB) $(OGL.OBJ) $(GLEE.OBJ) 
    6060     
    6161lib: gl glee lib_glglee 
    6262 
    63 lib_noglee: gl lib_gl 
     63noglee: gl lib_gl 
    6464 

  • trunk/DerelictGL/README

    r31 r33  
    1281282) from a command prompt, cd to <derelict_dir>\DerelictGL 
    1291293) type 'make' or 'make lib' to build derelictGL.lib with GLee 
    130    optionally type 'make lib_noglee' to build derelictGL.lib without GLee     
     130   optionally type 'make noglee' to build derelictGL.lib without GLee     
    1311314) optionally type 'make clean' to delete all object files OR 
    132132   optionally type 'make cleanall' to delete all object and lib files 

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

    r31 r33  
    205205* Loads all core GL 1.0 & 1.1 functions 
    206206*/ 
    207 private void DerelictGL_Load() 
     207private void loadGL() 
    208208{ 
    209209    // gl 1.0 
    …… 
    548548* the functions cannot be loaded, an Exception is thrown. 
    549549*/ 
    550 public void dglLoad() 
     550public void DerelictGL_Load() 
    551551{ 
    552552    if(hgl !== null) 

  • trunk/DerelictGLU/Makefile

    r31 r33  
    1717    $(GLU.OBJ.DIR)\glu.obj 
    1818 
    19 GLU.LIB = $(LIB.DIR)\derelictGLU 
     19GLU.LIB = $(LIB.DIR)\derelictGLU.lib 
    2020 
    2121DEFAULT: lib 
    …… 
    2525     
    2626clean_lib: 
    27     @del $(GLU.LIB).lib 
     27    @del $(GLU.LIB) 
    2828     
    2929clean: clean_obj 
    …… 
    3434    @md $(GLU.OBJ.DIR) 
    3535    dmd $(GLU.SRC) -c $(DFLAGS) $(DINC) -od$(GLU.OBJ.DIR) 
    36     lib $(LIBFLAGS) $(GLU.LIB).lib $(GLU.OBJ) 
     36    lib $(LIBFLAGS) $(GLU.LIB) $(GLU.OBJ) 
    3737 

  • trunk/DerelictSDL/Makefile

    r31 r33  
    5858    $(SDL.OBJ.DIR)\video.obj  
    5959     
    60 SDL.LIB = $(LIB.DIR)\derelictSDL 
     60SDL.LIB = $(LIB.DIR)\derelictSDL.lib 
    6161 
    6262DEFAULT: lib 
    …… 
    6666 
    6767clean_lib: 
    68     @del $(SDL.LIB).lib 
     68    @del $(SDL.LIB) 
    6969     
    7070clean: clean_obj 
    …… 
    7575    @md $(SDL.OBJ.DIR) 
    7676    dmd $(SDL.SRC) -c $(DFLAGS) $(DINC) -od$(SDL.OBJ.DIR) 
    77     lib $(LIBFLAGS) $(SDL.LIB).lib $(SDL.OBJ) 
     77    lib $(LIBFLAGS) $(SDL.LIB) $(SDL.OBJ) 
    7878