Commit b3f15f9c authored by moret's avatar moret
Browse files

Correct strange stl behaviour at runtime on windows - correct 'undefined...

Correct strange stl behaviour at runtime on windows - correct 'undefined reference' for alsaadapter - rebuild jackrouter.dll from a new libjack.lib

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3017 0c269be4-1314-0410-8aa9-9f06e86f4224
parent 01bb4f0f
......@@ -17,6 +17,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif
#include "JackAudioAdapter.h"
#include <stdio.h>
......
......@@ -94,7 +94,7 @@ namespace Jack
for ( i = 0; NetErrorList[i].code >= 0; ++i )
{
if ( error == NetErrorList[i].code )
return NetErrorList[i].msg.c_str();
return NetErrorList[i].msg;
}
return strerror ( error );
}
......
......@@ -40,7 +40,7 @@ namespace Jack
struct _win_net_error
{
int code;
std::string msg;
const char* msg;
};
SERVER_EXPORT const char* PrintError ( int error );
......
......@@ -5,6 +5,8 @@ You can use the 'jack.ci' script to make the installer. For that, you need to bu
If you need libjack.lib and libjackserver.lib to link with in MS Visual Studio, you can use the MS Tool lib.exe to create the .lib file from de .def.
Just use : 'lib /DEF:libjackserver.def /OUT:libjackserver.lib' and 'lib /DEF:libjack.def /OUT:libjack.lib' to create the lib file.
Or you can also use dlltool, from mingw suite :
Just use : 'dlltool -l libjackserver.lib -D libjackserver.dll -d libjackserver.def' and 'dlltool -l libjack.lib -D libjack.dll -d libjack.def'
Once all binaries available, just execute the script in 'CreateInstall' to make 'setup.exe'.
The setup will copy all binaries to a specified folder, register the JackRouter (in order to have it in the ASIO drivers list) and create some shortcuts in the start menu.
......
......@@ -33,8 +33,8 @@
<dlgsavepath> 1</>
<dlgautoprog> 1</>
<dlgfinish> 1</>
<comptype> deffast</>
<solid> 0</>
<comptype> defnorm</>
<solid> 1</>
<srcfolder> </>
<ifexist> over</>
<runafter> </>
......
......@@ -31,6 +31,9 @@
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add directory="Release\bin" />
</Linker>
</Target>
<Target title="Win32 Debug">
<Option output="Debug\bin\libjackserver" prefix_auto="1" extension_auto="1" />
......@@ -57,6 +60,9 @@
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add directory="Debug\bin" />
</Linker>
</Target>
<Target title="Win32 Monitor">
<Option output="Release\bin\libjackserver" prefix_auto="1" extension_auto="1" />
......@@ -84,6 +90,9 @@
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add directory="Release\bin" />
</Linker>
</Target>
</Build>
<Compiler>
......@@ -106,7 +115,6 @@
<Add library="odbc32" />
<Add library="odbccp32" />
<Add library="ws2_32" />
<Add directory="Release\bin" />
</Linker>
<Unit filename="..\common\JackAPI.cpp" />
<Unit filename="..\common\JackActivationCount.cpp" />
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment