diff --git a/ediv/bin/hola.prg b/ediv/bin/hola.prg index edc9d00..60ae710 100644 --- a/ediv/bin/hola.prg +++ b/ediv/bin/hola.prg @@ -3,7 +3,7 @@ private fuente; begin - set_mode(320,200,24,_fullscreen); + set_mode(320,200,24); graph=load_bmp("hola.bmp"); smooth=1; x=160; @@ -11,9 +11,17 @@ begin size=200; fuente=load_fnt("system.fnt"); write(fuente,160,40,4,"HOLA"); + define_region(1,10,10,300,180); + region=1; loop frame; angle+=1000; + if(key(_left)) x-=5; end + if(key(_right)) x+=5; end + if(key(_up)) y-=5; end + if(key(_down)) y+=5; end + if(key(_a)) size+=10; end + if(key(_z)) size-=10; end end end diff --git a/ediv/src/ediv/ediv.c b/ediv/src/ediv/ediv.c index edcf00e..f556274 100644 --- a/ediv/src/ediv/ediv.c +++ b/ediv/src/ediv/ediv.c @@ -53,6 +53,10 @@ void conecta(char *servidor, char *archivo); #include "language.h" #include "edivcfg/iniparser.h" +#ifdef main +#undef main +#endif + int main(int argc, char *argv[]) { FILE *fp; /* stream del PRG */ diff --git a/ediv/src/shared/extern.h b/ediv/src/shared/extern.h index bfb71f4..51425f0 100644 --- a/ediv/src/shared/extern.h +++ b/ediv/src/shared/extern.h @@ -21,7 +21,7 @@ #ifndef __EXTERN_H #define __EXTERN_H -#include +//#include #include "main.h" #include "varindex.h" @@ -81,7 +81,8 @@ typedef struct { } eDIV_Rect; /* Dibuja */ -typedef int (TYPEOF_Dibuja)(byte *, eDIV_Rect , eDIV_Rect , int , int ) ; +//typedef int (TYPEOF_Dibuja)(byte *, eDIV_Rect , eDIV_Rect , int , int ) ; +typedef int (TYPEOF_Dibuja)(byte*,int x,int y,int cx,int cy,int region,int z,int trans,int size,int angle); /* Errores */ typedef void (TYPEOF_Runtime_Error)(int, ...); diff --git a/ediv/src/stub/modulos.c b/ediv/src/stub/modulos.c index 3021025..f01831c 100644 --- a/ediv/src/stub/modulos.c +++ b/ediv/src/stub/modulos.c @@ -26,6 +26,7 @@ #include #endif +#include #include #include #include "modulos.h" diff --git a/ediv/src/stub/stub.c b/ediv/src/stub/stub.c index 4a0eb04..355c910 100644 --- a/ediv/src/stub/stub.c +++ b/ediv/src/stub/stub.c @@ -26,7 +26,7 @@ #include #include -#include +//#include #include #include "extern.h" @@ -47,9 +47,9 @@ * mem, imem_max, etc) */ -/*#ifdef main +#ifdef main #undef main -#endif*/ +#endif int main(int argc, char* argv[]) { diff --git a/ediv/src/visual c 6/ediv/ediv.plg b/ediv/src/visual c 6/ediv/ediv.plg index 1e063f5..5ff617b 100644 --- a/ediv/src/visual c 6/ediv/ediv.plg +++ b/ediv/src/visual c 6/ediv/ediv.plg @@ -6,53 +6,11 @@ --------------------Configuration: ediv - Win32 Debug--------------------

Command Lines

-Creating temporary file "C:\WINDOWS\TEMP\RSPD050.TMP" with contents -[ -/nologo /MD /W3 /Gm /GX /ZI /Od /I "..\..\..\inc" /I "..\..\shared" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"Debug/" /Fp"Debug/ediv.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c -"C:\Temp\ediv\ediv\src\ediv\compiler.c" -"C:\Temp\ediv\ediv\src\ediv\ediv.c" -"C:\Temp\ediv\ediv\src\ediv\ediv_export.c" -"C:\Temp\ediv\ediv\src\ediv\modulos.c" -"C:\Temp\ediv\ediv\src\ediv\parser.c" -] -Creating command line "cl.exe @C:\WINDOWS\TEMP\RSPD050.TMP" -Creating temporary file "C:\WINDOWS\TEMP\RSPD051.TMP" with contents -[ -kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib sdlmain.lib sdl.lib ws2_32.lib zlib.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/ediv.pdb" /debug /machine:I386 /out:"..\..\..\bin\ediv.exe" /pdbtype:sept /libpath:"..\..\..\lib" -".\Debug\dictionary.obj" -".\Debug\e_error.obj" -".\Debug\edivcfg.obj" -".\Debug\mainparse.obj" -".\Debug\strlib.obj" -".\Debug\compiler.obj" -".\Debug\dll_load.obj" -".\Debug\ediv.obj" -".\Debug\ediv_export.obj" -".\Debug\encrypt.obj" -".\Debug\expresion.obj" -".\Debug\language.obj" -".\Debug\listados.obj" -".\Debug\lower.obj" -".\Debug\ltlex.obj" -".\Debug\modulos.obj" -".\Debug\parser.obj" -".\Debug\varindex.obj" -] -Creating command line "link.exe @C:\WINDOWS\TEMP\RSPD051.TMP" -

Output Window

-Compiling... -compiler.c -ediv.c -c:\temp\ediv\ediv\src\ediv\ediv.c(206) : warning C4018: '<=' : signed/unsigned mismatch -ediv_export.c -modulos.c -parser.c -Linking...

Results

-ediv.exe - 0 error(s), 1 warning(s) +ediv.exe - 0 error(s), 0 warning(s) diff --git a/ediv/src/visual c 6/encrypt/encrypt.plg b/ediv/src/visual c 6/encrypt/encrypt.plg index 621f860..add371b 100644 --- a/ediv/src/visual c 6/encrypt/encrypt.plg +++ b/ediv/src/visual c 6/encrypt/encrypt.plg @@ -6,27 +6,28 @@ --------------------Configuration: encrypt - Win32 Debug--------------------

Command Lines

-Creating temporary file "C:\WINDOWS\TEMP\RSP91B3.TMP" with contents +Creating temporary file "C:\WINDOWS\TEMP\RSP9223.TMP" with contents [ /nologo /MD /W3 /Gm /GX /ZI /Od /I "..\..\..\inc" /I "..\..\shared" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"Debug/encrypt.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c "C:\Temp\ediv\ediv\src\encrypt\encrypt.c" ] -Creating command line "cl.exe @C:\WINDOWS\TEMP\RSP91B3.TMP" -Creating temporary file "C:\WINDOWS\TEMP\RSP91B4.TMP" with contents +Creating command line "cl.exe @C:\WINDOWS\TEMP\RSP9223.TMP" +Creating temporary file "C:\WINDOWS\TEMP\RSP9224.TMP" with contents [ zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib sdlmain.lib sdl.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/encrypt.pdb" /debug /machine:I386 /out:"..\..\..\bin\encrypt.exe" /pdbtype:sept /libpath:"..\..\..\lib" ".\Debug\encrypt.obj" ] -Creating command line "link.exe @C:\WINDOWS\TEMP\RSP91B4.TMP" +Creating command line "link.exe @C:\WINDOWS\TEMP\RSP9224.TMP"

Output Window

Compiling... encrypt.c Linking... +LINK : warning LNK4098: defaultlib "LIBC" conflicts with use of other libs; use /NODEFAULTLIB:library

Results

-encrypt.exe - 0 error(s), 0 warning(s) +encrypt.exe - 0 error(s), 1 warning(s) diff --git a/ediv/src/visual c 6/stub/stub.plg b/ediv/src/visual c 6/stub/stub.plg index 62e3be7..6f20475 100644 --- a/ediv/src/visual c 6/stub/stub.plg +++ b/ediv/src/visual c 6/stub/stub.plg @@ -6,65 +6,48 @@ --------------------Configuration: stub - Win32 Debug--------------------

Command Lines

-Creating temporary file "C:\WINDOWS\TEMP\RSPE175.TMP" with contents +Creating temporary file "C:\WINDOWS\TEMP\RSP4095.TMP" with contents [ /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\inc" /I "..\..\shared" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FR"Debug/" /Fp"Debug/stub.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c -"C:\Temp\ediv\ediv\src\stub\dll.c" -"C:\Temp\ediv\ediv\src\stub\ediv_export.c" -"C:\Temp\ediv\ediv\src\stub\error.c" -"C:\Temp\ediv\ediv\src\stub\inte.c" -"C:\Temp\ediv\ediv\src\stub\stub.c" -"C:\Temp\ediv\ediv\src\stub\fatal.c" -"C:\Temp\ediv\ediv\src\stub\lower.c" "C:\Temp\ediv\ediv\src\stub\modulos.c" -"C:\Temp\ediv\ediv\src\stub\varindex.c" ] -Creating command line "cl.exe @C:\WINDOWS\TEMP\RSPE175.TMP" -Creating temporary file "C:\WINDOWS\TEMP\RSPE176.TMP" with contents +Creating command line "cl.exe @C:\WINDOWS\TEMP\RSP4095.TMP" +Creating temporary file "C:\WINDOWS\TEMP\RSP4096.TMP" with contents [ sdlmain.lib sdl.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/stub.pdb" /debug /machine:I386 /out:"..\..\..\bin\stub.exe" /pdbtype:sept /libpath:"..\..\..\lib" ".\Debug\dll.obj" ".\Debug\dll_load.obj" ".\Debug\ediv_export.obj" ".\Debug\error.obj" +".\Debug\fatal.obj" ".\Debug\inte.obj" ".\Debug\language.obj" -".\Debug\stub.obj" -".\Debug\fatal.obj" ".\Debug\lower.obj" ".\Debug\modulos.obj" +".\Debug\stub.obj" ".\Debug\varindex.obj" ] -Creating command line "link.exe @C:\WINDOWS\TEMP\RSPE176.TMP" +Creating command line "link.exe @C:\WINDOWS\TEMP\RSP4096.TMP"

Output Window

Compiling... -dll.c -ediv_export.c -error.c -inte.c -c:\temp\ediv\ediv\src\stub\inte.c(46) : warning C4101: 'i' : unreferenced local variable -stub.c -fatal.c -lower.c modulos.c -varindex.c Linking... LINK : LNK6004: ..\..\..\bin\stub.exe not found or not built by the last incremental link; performing full link -LINK : warning LNK4098: defaultlib "MSVCRT" conflicts with use of other libs; use /NODEFAULTLIB:library -Creating temporary file "C:\WINDOWS\TEMP\RSPE233.BAT" with contents +LINK : warning LNK4098: defaultlib "LIBC" conflicts with use of other libs; use /NODEFAULTLIB:library +Creating temporary file "C:\WINDOWS\TEMP\RSP40C0.BAT" with contents [ @echo off cd ..\..\..\bin makelib win32.rel ] -Creating command line "C:\WINDOWS\TEMP\RSPE233.BAT" +Creating command line "C:\WINDOWS\TEMP\RSP40C0.BAT" -STUB_SIZE: 208965 +STUB_SIZE: 196677

Results

-stub.exe - 0 error(s), 2 warning(s) +stub.exe - 0 error(s), 1 warning(s)