diff --git a/README.TXT b/README.TXT new file mode 100644 index 0000000..096daf5 --- /dev/null +++ b/README.TXT @@ -0,0 +1,7 @@ +MSVC 6.0 required! + +1) Install freeimage241 and fmod375 into same dir as blitz3d. + +2) Build bblaunch project in 'Win32 Blitz3DRelease' config. + +3) Output files in blitz3d/_release dir. diff --git a/bblaunch/bblaunch.dsp b/bblaunch/bblaunch.dsp index 7718ec4..f7b231e 100644 --- a/bblaunch/bblaunch.dsp +++ b/bblaunch/bblaunch.dsp @@ -112,7 +112,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 dxguid.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:windows /machine:I386 /out:"..\blitzbasic\blitzbasic.exe" -# ADD LINK32 dxguid.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:windows /machine:I386 /out:"..\..\release\blitz3drelease\Blitz3D.exe" +# ADD LINK32 dxguid.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:windows /machine:I386 /out:"../_release/Blitz3D.exe" !ELSEIF "$(CFG)" == "bblaunch - Win32 Blitz2DRelease" diff --git a/bbruntime_dll/bbruntime_dll.dsp b/bbruntime_dll/bbruntime_dll.dsp index f89143a..d5c6ca5 100644 --- a/bbruntime_dll/bbruntime_dll.dsp +++ b/bbruntime_dll/bbruntime_dll.dsp @@ -112,7 +112,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 wsock32.lib winmm.lib dxguid.lib d3dxof.lib dplayx.lib ddraw.lib dinput.lib dsound.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 /dll /machine:I386 /force /out:"..\blitzbasic\bin\runtime.dll" -# ADD LINK32 wsock32.lib amstrmid.lib winmm.lib dxguid.lib d3dxof.lib dplayx.lib ddraw.lib dinput.lib dsound.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 /dll /machine:I386 /force /out:"..\..\release\blitz3drelease\bin\runtime.dll" +# ADD LINK32 wsock32.lib amstrmid.lib winmm.lib dxguid.lib d3dxof.lib dplayx.lib ddraw.lib dinput.lib dsound.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 /dll /machine:I386 /force /out:"../_release/bin/runtime.dll" !ELSEIF "$(CFG)" == "bbruntime_dll - Win32 Blitz2DRelease" @@ -243,7 +243,7 @@ SOURCE=..\..\FreeImage241\Source\FreeImageLib\Release\FreeImage.lib # End Source File # Begin Source File -SOURCE=..\..\fmodsrc375win\win\Final\fmodstatic.lib +SOURCE=..\..\fmod375\fmodstatic.lib # End Source File # End Target # End Project diff --git a/blitz/blitz.dsp b/blitz/blitz.dsp index 91287fb..3d936ba 100644 --- a/blitz/blitz.dsp +++ b/blitz/blitz.dsp @@ -103,7 +103,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /machine:I386 /out:"..\blitzbasic\bin\blitzcc.exe" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /machine:I386 /out:"..\..\release\blitz3drelease\bin\blitzcc.exe" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /machine:I386 /out:"../_release/bin/blitzcc.exe" !ELSEIF "$(CFG)" == "blitz - Win32 Blitz2DRelease" diff --git a/blitz3d.dsw b/blitz3d.dsw index 00889b9..ad5fc10 100644 --- a/blitz3d.dsw +++ b/blitz3d.dsw @@ -56,6 +56,9 @@ Package=<4> Begin Project Dependency Project_Dep_Name blitz End Project Dependency + Begin Project Dependency + Project_Dep_Name blitz3d + End Project Dependency }}} ############################################################################### diff --git a/blitzide/blitzide.dsp b/blitzide/blitzide.dsp index f5a4f11..c31bcb6 100644 --- a/blitzide/blitzide.dsp +++ b/blitzide/blitzide.dsp @@ -115,7 +115,7 @@ BSC32=bscmake.exe LINK32=link.exe # ADD BASE LINK32 winmm.lib /nologo /subsystem:windows /machine:I386 /force /out:"..\blitzbasic\bin\ide.exe" # SUBTRACT BASE LINK32 /debug /nodefaultlib -# ADD LINK32 winmm.lib /nologo /subsystem:windows /machine:I386 /force /out:"..\..\release\blitz3drelease\bin\ide.exe" +# ADD LINK32 winmm.lib /nologo /subsystem:windows /machine:I386 /force /out:"../_release/bin/ide.exe" # SUBTRACT LINK32 /debug /nodefaultlib !ELSEIF "$(CFG)" == "blitzide - Win32 Blitz2DRelease" diff --git a/debugger/debugger.dsp b/debugger/debugger.dsp index dacf393..388f323 100644 --- a/debugger/debugger.dsp +++ b/debugger/debugger.dsp @@ -115,7 +115,7 @@ BSC32=bscmake.exe LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /dll /machine:I386 /out:"..\blitzbasic\bin\debugger.dll" # SUBTRACT BASE LINK32 /pdb:none /force -# ADD LINK32 /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\release\blitz3drelease\bin\debugger.dll" +# ADD LINK32 /nologo /subsystem:windows /dll /machine:I386 /out:"../_release/bin/debugger.dll" # SUBTRACT LINK32 /pdb:none /force !ELSEIF "$(CFG)" == "debugger - Win32 Blitz2DRelease" diff --git a/gxruntime/std.h b/gxruntime/std.h index 61739b1..727cdad 100644 --- a/gxruntime/std.h +++ b/gxruntime/std.h @@ -24,7 +24,7 @@ #include #include -#include "../../fmodsrc375win/src/fmod.h" +#include "../../fmod375/fmod.h" using namespace std; diff --git a/linker_dll/linker_dll.dsp b/linker_dll/linker_dll.dsp index ea6dd6b..5cf403f 100644 --- a/linker_dll/linker_dll.dsp +++ b/linker_dll/linker_dll.dsp @@ -112,7 +112,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 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 /dll /machine:I386 /out:"..\blitzbasic\bin\linker.dll" -# ADD LINK32 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 /dll /machine:I386 /out:"..\..\release\blitz3drelease\bin\linker.dll" +# ADD LINK32 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 /dll /machine:I386 /out:"../_release/bin/linker.dll" !ELSEIF "$(CFG)" == "linker_dll - Win32 Blitz2DRelease"