diff --git a/Makefile b/Makefile index 2a20827..1e1efa0 100755 --- a/Makefile +++ b/Makefile @@ -96,13 +96,10 @@ relsrc: target rm -rf $(RELDIR)/* ; \ fi ; cp Makefile* license.terms README-SDL.txt Readme Readme.MacOSX-Cocoa Readme.win32 esdl.pub $(RELDIR) - cp Configure-cygwin-mingw.sh $(RELDIR) + cp Configure-cygwin-mingw.sh Configure-mingw.sh $(RELDIR) echo ESDL_VSN=$(REL) > $(RELDIR)/vsn.mk - mkdir $(RELDIR)/api_gen - cp api_gen/conv.erl api_gen/gldefs api_gen/glfuncs \ - api_gen/gludefs api_gen/glufuncs $(RELDIR)/api_gen mkdir $(RELDIR)/c_src - cp c_src/*.h c_src/*.c c_src/SDLMain.m c_src/Makefile* $(RELDIR)/c_src + cp c_src/*.h c_src/*.c c_src/Makefile* $(RELDIR)/c_src mkdir $(RELDIR)/doc cp doc/Makefile* doc/makedoc.erl doc/*.html $(RELDIR)/doc mkdir $(RELDIR)/ebin diff --git a/Readme b/Readme index b638051..a2f0845 100755 --- a/Readme +++ b/Readme @@ -7,18 +7,19 @@ News I have removed the opengl specific part from esdl, now esdl requires that wx is available for opengl usage. - This means that this release is not backwards compatiable + This means that this release is not backwards compatible with the old release, some gl functions have been changed in wx gl. This is done to only have one gl.erl in your (erlang) system, and it also more up to date with the standard. - Actually only wx/ebin/gl.beam, wx_util.beam and wx/priv/OS/erl_gl.[so|dll] + Actually only wx/ebin/gl.beam wx/ebin/glu.beam and wx/priv/OS/erl_gl.[so|dll] is required. Also using wx's opengl allowed me to create an opengl thread, if the erlang emulator is multithreaded. So now sdl with opengl works for both smp and single threaded erlang. + What is it? =========== Esdl is library for accessing SDL (Simple DirectMedia Layer) @@ -40,7 +41,7 @@ Compilation and Installation ============================= You need erlang (www.erlang.org). This release has only been -tested on R14B01, it requires that version for opengl to work. +tested on R14B02, it requires that version for opengl to work. You need libsdl (www.libsdl.org) (the development package) version > 1.2.5 diff --git a/Readme.win32 b/Readme.win32 index ce21a33..332a8be 100755 --- a/Readme.win32 +++ b/Readme.win32 @@ -35,7 +35,7 @@ Needed tools ------------ *) Cygwin, full installation with development tools etc. - http://www.cygwin.com + http://www.cygwin.com (or Msys is enough nowadays) *) MinGW, you can use the self installing EXE package. Add to your cygwin path properly. @@ -47,7 +47,7 @@ Needed tools needed in runtime as well as compile time. http://www.libsdl.org -*) Erlang, currently 5.3 (R9C-0) or later is required. Note the thing +*) Erlang, currently (R14B02) or later is required. Note the thing about PATH's and spaces above. Erlang does not add itself to your path upon installation, add the appropriate path to your .bashrc. http://www.erlang.org @@ -59,8 +59,9 @@ Configuring ----------- In the same directory as this file resides, you should find a shell -script named Configure-cygwin-mingw.sh. Run it from within the cygwin -bash shell. cd to the directory where it resides before running. +script named Configure-cygwin-mingw.sh or Configure-mingw in msys. +Run it from within the cygwin bash shell. cd to the directory where it +resides before running. If it fails, try to correct what seems to be wrong and run again. When successful, you should have everything you need to compile. diff --git a/c_src/esdl_util.c b/c_src/esdl_util.c index 49adb7f..1f3e137 100755 --- a/c_src/esdl_util.c +++ b/c_src/esdl_util.c @@ -47,7 +47,7 @@ void copySdlImage2GLArray(sdl_data *sd, int len, char * buff) SDL_Surface *image; unsigned char * mem; char *bp, *start; - int i, j = 0, k, sendlen; + int i, j = 0, k; Uint8 rs,bs,gs,as; bp = buff;