Working 64 and 32 bits installer on Windows.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4294 0c269be4-1314-0410-8aa9-9f06e86f4224

windows/JackRouter/JackRouter.cpp

@@ -29,13 +29,12 @@ Copyright (C) 2006 Grame
 #include "profport.h"
 
 /*
-
 	08/07/2007 SL : USe jack_client_open instead of jack_client_new (automatic client renaming).
 	09/08/2007 SL : Add JackRouter.ini parameter file.
 	09/20/2007 SL : Better error report in DllRegisterServer (for Vista).
 	09/27/2007 SL : Add AUDO_CONNECT property in JackRouter.ini file.
 	10/10/2007 SL : Use ASIOSTInt32LSB instead of ASIOSTInt16LSB.
-
+	12/04/2011 SL : Compilation on Windows 64.
  */
 
 //------------------------------------------------------------------------------------------
@@ -54,7 +53,13 @@ static const double twoRaisedTo32Reciprocal = 1. / twoRaisedTo32;
 #if WINDOWS
 #include "windows.h"
 #include "mmsystem.h"
-#include "psapi.h"
+#ifdef _WIN64
+#define JACK_ROUTER "JackRouter64.dll"
+#include <psapi.h>
+#else
+#define JACK_ROUTER "JackRouter.dll"
+#include "./psapi.h"
+#endif
 
 using namespace std;
 
@@ -95,11 +100,11 @@ HRESULT _stdcall DllRegisterServer()
 	LONG	rc;
 	char	errstr[128];
 
-	rc = RegisterAsioDriver (IID_ASIO_DRIVER,"JackRouter.dll","JackRouter","JackRouter","Apartment");
+	rc = RegisterAsioDriver (IID_ASIO_DRIVER, JACK_ROUTER,"JackRouter","JackRouter","Apartment");
 
 	if (rc) {
 		memset(errstr,0,128);
-		sprintf(errstr,"Register Server failed ! (%d)",rc);
+		sprintf(errstr,"Register Server failed ! (%s %d)",JACK_ROUTER, rc);
 		MessageBox(0,(LPCTSTR)errstr,(LPCTSTR)"JackRouter",MB_OK);
 		return -1;
 	}
@@ -115,7 +120,7 @@ HRESULT _stdcall DllUnregisterServer()
 	LONG	rc;
 	char	errstr[128];
 
-	rc = UnregisterAsioDriver (IID_ASIO_DRIVER,"JackRouter.dll","JackRouter");
+	rc = UnregisterAsioDriver (IID_ASIO_DRIVER,JACK_ROUTER,"JackRouter");
 
 	if (rc) {
 		memset(errstr,0,128);
@@ -175,7 +180,7 @@ JackRouter::JackRouter() : AsioDriver()
 	printf("Constructor\n");
 
 	// Use "jackrouter.ini" parameters if available
-	HMODULE handle = LoadLibrary("JackRouter.dll");
+	HMODULE handle = LoadLibrary(JACK_ROUTER);
 
 	if (handle) {
 
@@ -209,15 +214,11 @@ JackRouter::~JackRouter()
 {
 	stop ();
 	disposeBuffers ();
-	printf("Destructor\n");
 	jack_client_close(fClient);
+	printf("Destructor\n");
 }
 
 //------------------------------------------------------------------------------------------
-#include <windows.h>
-#include <stdio.h>
-#include <tchar.h>
-#include "psapi.h"
 
 static bool GetEXEName(DWORD dwProcessID, char* name)
 {

windows/JackRouter/resource.rc

@@ -1,4 +1,4 @@
-//Microsoft Developer Studio generated resource script.
+// Microsoft Visual C++ generated resource script.
 //
 #include "resource.h"
 
@@ -13,15 +13,12 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// French (France) resources
+// Français (France) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
-#ifdef _WIN32
 LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
 #pragma code_page(1252)
-#endif //_WIN32
 
-#ifndef _MAC
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
@@ -44,18 +41,14 @@ BEGIN
     BEGIN
         BLOCK "040c04b0"
         BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "Grame\0"
-            VALUE "FileDescription", "JackRouter ASIO driver\0"
-            VALUE "FileVersion", "0, 2, 1, 0\0"
-            VALUE "InternalName", "JackRouter\0"
-            VALUE "LegalCopyright", "Copyright Grame © 2006-2010\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "JackRouter.dll\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "JackRouter\0"
-            VALUE "ProductVersion", "0, 2, 1, 0\0"
-            VALUE "SpecialBuild", "\0"
+            VALUE "CompanyName", "Grame"
+            VALUE "FileDescription", "JackRouter ASIO driver"
+            VALUE "FileVersion", "0, 2, 1, 0"
+            VALUE "InternalName", "JackRouter"
+            VALUE "LegalCopyright", "Copyright Grame © 2006-2011"
+            VALUE "OriginalFilename", "JackRouter.dll"
+            VALUE "ProductName", "JackRouter"
+            VALUE "ProductVersion", "0, 2, 1, 0"
         END
     END
     BLOCK "VarFileInfo"
@@ -64,8 +57,6 @@ BEGIN
     END
 END
 
-#endif    // !_MAC
-
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -73,18 +64,18 @@ END
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE DISCARDABLE 
+1 TEXTINCLUDE 
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE DISCARDABLE 
+2 TEXTINCLUDE 
 BEGIN
     "#include ""afxres.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE DISCARDABLE 
+3 TEXTINCLUDE 
 BEGIN
     "\r\n"
     "\0"
@@ -92,7 +83,7 @@ END
 
 #endif    // APSTUDIO_INVOKED
 
-#endif    // French (France) resources
+#endif    // Français (France) resources
 /////////////////////////////////////////////////////////////////////////////
 
 

windows/Setup/jack.ci

@@ -1,7 +1,7 @@
 <*project
       version = 4 civer = "Free v4.14.5" winver = "2.6/5.1.2600" > 
    <output> .</>
-   <exename> Jack_v1.9.8_setup.exe</>
+   <exename> Jack_v1.9.8_32_setup.exe</>
    <digitsign> </>
    <appname> Jack v1.9.8</>
    <password> </>

windows/Setup/jack64.ci

@@ -1,5 +1,5 @@
 <*project
-      version = 4 civer = "Free v4.14.5" winver = "2.6/5.1.2600" >
+      version = 4 civer = "Free v4.14.5" winver = "2.8/6.1.7600" > 
    <output> .</>
    <exename> Jack_v1.9.8_64_setup.exe</>
    <digitsign> </>
@@ -50,16 +50,26 @@
    <bl> My Demo</>
    <blurl> </>
    <bghead> </>
-   <bgfoot> </>
+   <bgfoot> </> 
    <bgback> </>
    <files listview >
-      <_><src>..\Release64\bin\libjack64.a</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
-<_><src>.\src\vcredist_x86.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+      <_><src>.\src\vcredist_x86.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\libjack64.a</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release64\bin\libjack64.lib</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release64\bin\libjack64.def</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\libjack64.dll</><dest>win</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release64\bin\libjackserver64.a</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release64\bin\libjackserver64.lib</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release64\bin\libjackserver64.def</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\libjackserver64.dll</><dest>win</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release\bin\libjack.a</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release\bin\libjack.lib</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release\bin\libjack.def</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release\bin\libjack.dll</><dest>sys</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release\bin\libjackserver.a</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release\bin\libjackserver.lib</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release\bin\libjackserver.def</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release\bin\libjackserver.dll</><dest>sys</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release64\bin\jack_connect.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release64\bin\jack_disconnect.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release64\bin\jack_load.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
@@ -67,10 +77,9 @@
 <_><src>..\Release64\bin\jack_metro.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release64\bin\jack_unload.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release64\bin\jackd.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\libjack64.dll</><dest>sys</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\libjackserver64.dll</><dest>sys</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\libsamplerate-0-x86_64.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\libsamplerate_x86_64.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release64\bin\portaudio_x86_64.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release\bin\portaudio_x86.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release64\bin\jack\jack_net.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release64\bin\jack\jack_netone.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release64\bin\jack_netsource.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
@@ -94,6 +103,7 @@
 <_><src>..\..\common\jack\systemdeps.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>1</></>
 <_><src>..\..\common\jack\weakjack.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>1</></>
 <_><src>..\..\common\jack\weakmacros.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>1</></>
+<_><src>.\JackRouter.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>.\JackRouter64.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>.\JackRouter.ini</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>.\qjackctl\mingwm10.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
@@ -106,37 +116,38 @@
 
    </files>
    <runx listview >
-<_><type>app</><path>inst</><file>vcredist_x86.exe</><cmdline></><wait>1</><workdir>inst</><custdir></><when>end</></>
+      <_><type>app</><path>inst</><file>vcredist_x86.exe</><cmdline></><wait>1</><workdir>inst</><custdir></><when>end</></>
 
    </runx>
    <registry listview >
-
+      
    </registry>
    <shcut listview >
-<_><shpath>prog</><shname>Jack NetDriver</><tarpath>inst</><tarname>jackd.exe</><cmdline>-R -S -d net</><workpath>inst</><workcust></><icon></></>
+      <_><shpath>prog</><shname>Jack NetDriver</><tarpath>inst</><tarname>jackd.exe</><cmdline>-R -S -d net</><workpath>inst</><workcust></><icon></></>
 <_><shpath>prog</><shname>Jack Portaudio</><tarpath>inst</><tarname>jackd.exe</><cmdline>-R -S -d portaudio</><workpath>inst</><workcust></><icon></></>
 <_><shpath>prog</><shname>Jack Control</><tarpath>inst</><tarname>qjackctl.exe</><cmdline></><workpath>inst</><workcust></><icon>jackdmp.exe</></>
 <_><shpath>prog</><shname>Jack Command</><tarpath>sys</><tarname>cmd.exe</><cmdline></><workpath>inst</><workcust></><icon></></>
 
    </shcut>
    <ini listview >
-
+      
    </ini>
    <copy listview >
-
+      
    </copy>
    <activex listview >
-      <_><path>inst</><name>JackRouter64.dll</></>
+	  <_><path>inst</><name>JackRouter.dll</></>
+ 	  <_><path>inst</><name>JackRouter64.dll</></>
 
    </activex>
    <font listview >
-
+      
    </font>
    <ext listview >
-
+      
    </ext>
    <mreg listview >
-
+      
    </mreg>
    <macros> Pathadd=</>
-</project>
+</project>