Fix Java viewer integration when building WinVNC with MinGW

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4727 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/win/winvnc/CMakeLists.txt b/win/winvnc/CMakeLists.txt
index 3b576a7b6a3b010a6c783eaf6ad2f27e4529a60b..dc567b12afd662916781fa8c8c97371efb694e20 100644 (file)
--- a/win/winvnc/CMakeLists.txt
+++ b/win/winvnc/CMakeLists.txt
@@ -7,11 +7,11 @@ endif()
 
 add_library(wm_hooks SHARED
   ../wm_hooks/wm_hooks.cxx
-       ../wm_hooks/wm_hooks.def
-       ../wm_hooks/wm_hooks.rc)
+  ../wm_hooks/wm_hooks.def
+  ../wm_hooks/wm_hooks.rc)
 
-string(REGEX REPLACE "/" "\\\\\\\\" CMAKE_WIN_BINARY_DIR ${CMAKE_BINARY_DIR})
-string(REGEX REPLACE "/" "\\\\\\\\" CMAKE_WIN_SOURCE_DIR ${CMAKE_SOURCE_DIR})
+set(VNCVIEWER_JAR_PATH ${CMAKE_BINARY_DIR}/java/VncViewer.jar)
+set(INDEX_VNC_PATH ${CMAKE_CURRENT_SOURCE_DIR}/index.vnc)
 
 configure_file(winvnc.rc.in winvnc.rc)
 

diff --git a/win/winvnc/JavaViewer.cxx b/win/winvnc/JavaViewer.cxx
index 39ff915a5d67bacf319dcefcbed3c22123977af1..6f9f6de510fd1afb537ae6e6fa7c08d54f6ef559 100644 (file)
--- a/win/winvnc/JavaViewer.cxx
+++ b/win/winvnc/JavaViewer.cxx
@@ -45,6 +45,10 @@ rdr::InStream* JavaViewerServer::getFile(const char* name,
 {
   if (strcmp(name, "/") == 0)
     name = "/index.vnc";
+  if (strcmp(name, "/VncViewer.jar") == 0)
+    name = "VncViewer.jar";
+  if (strcmp(name, "/index.vnc") == 0)
+    name = "index.vnc";
 
   HRSRC resource = FindResource(0, TStr(name), _T("HTTPFILE"));
   if (!resource) return 0;

diff --git a/win/winvnc/winvnc.rc.in b/win/winvnc/winvnc.rc.in
index 3c484ed75cdd849d04a5fba6de0ba79c6b3ea6f6..b59befde74282cbb32aea198f659309529db898f 100644 (file)
--- a/win/winvnc/winvnc.rc.in
+++ b/win/winvnc/winvnc.rc.in
@@ -223,8 +223,8 @@ END
 #cmakedefine BUILD_JAVA
 
 #ifdef BUILD_JAVA
-/VNCVIEWER.JAR          HTTPFILE DISCARDABLE    "@CMAKE_WIN_BINARY_DIR@\\java\\VncViewer.jar"
-/INDEX.VNC              HTTPFILE DISCARDABLE    "@CMAKE_WIN_SOURCE_DIR@\\win\\winvnc\\index.vnc"
+VNCVIEWER.JAR          HTTPFILE DISCARDABLE    "@VNCVIEWER_JAR_PATH@"
+INDEX.VNC              HTTPFILE DISCARDABLE    "@INDEX_VNC_PATH@"
 #endif
 
 /////////////////////////////////////////////////////////////////////////////