Re #313 (Improve Windows binary installer) Multi-plateform speed-dreams-2 install / user settings folder prefix, executable name, and sd2-prefixed tools executables names to enable cohabitation with 1.4.x

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@3261 30fe4595-0a0c-4342-8851-515496e4dcbd
2011-01-12 19:32:40 +00:00 · 2011-01-12 19:32:40 +00:00 · e726f4eaa8
parent 83b83e250a
commit e726f4eaa8
15 changed files with 113 additions and 89 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -107,9 +107,6 @@ SD_INSTALL_FILES(DATA "/"
                 FILES credits.xml 
                       CHANGES.txt COPYING.txt INSTALL.txt README.txt TODO.txt)

-SD_INSTALL_FILES(BIN
-                 FILES sd-robotgen.sh)
-
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(data)
 ADD_SUBDIRECTORY(cmake)
@ -128,6 +125,17 @@ ELSE(WIN32)
 	ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/uninstall.cmake" )
 ENDIF(WIN32)

+# Ensure system run-time libs are installed under Windows (MSVC*80.dll and co.).
+# We do it ourselves, but use InstallRequiredSystemLibraries to figure out what they are
+IF(WIN32)
+	SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
+	INCLUDE(InstallRequiredSystemLibraries)
+	IF(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS)
+		INSTALL(PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} 
+		        DESTINATION ${SD_BINDIR_ABS})
+	ENDIF(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS)
+ENDIF(WIN32)
+
 # Configure CPack.
 INCLUDE(cmake/packagemaker.cmake)

--- a/INSTALL.txt
+++ b/INSTALL.txt
@ -62,11 +62,17 @@ The Speed Dreams Team.

  a - uncompress the tarball :

-      $ tar xfvj speed-dreams-xxx.tar.bz2
+     . if bzip2-compressed (the old way) :
+
+         $ tar xfvj speed-dreams-xxx.tar.bz2
+
+     . if 7z-compressed (the new way) :
+
+      $ 7zr x -so speed-dreams-xxx.tar.7z | tar xvf -

  b - configure :

-    1.  cd to the path where Speed-dreams sources are installed.
+    1.  cd to the path where Speed Dreams sources are installed.

      $ cd <speed-dreams-source-tree>

@ -84,10 +90,10 @@ The Speed Dreams Team.

          Example :

-            $ cmake -D TORCS_LOCALDIR:STRING=~/dev/.speed-dreams \
-                    -D CMAKE_INSTALL_PREFIX:PATH=/usr/local/dev \
+            $ cmake -D SD_LOCALDIR:STRING=~/dev/.sd-settings \
+                    -D CMAKE_PREFIX_PATH:STRING=/usr/local
                    -D CMAKE_BUILD_TYPE:STRING=Debug \
-                    -D OPTION_DEBUG:BOOL=ON
+                    -D OPTION_OFFICIAL_ONLY:BOOL=OFF

        or else you can use ccmake to change the variables interactively :

@ -106,8 +112,14 @@ The Speed Dreams Team.

        Usefull CMake variables for Speed Dreams :

-        - TORCS_LOCALDIR:STRING		: User settings dir for run-time (def: ~/.speed-dreams)
-        - OPTION_DEBUG:BOOL		    : Full run-time traces if ON (def: OFF)
+        - SD_LOCALDIR:STRING		: User settings dir for run-time (def: ~/.speed-dreams-2)
+        - OPTION_DEBUG:BOOL			: Full run-time traces if ON (def: OFF)
+        - OPTION_TRACE_LEVEL:STRING : Run-time traces level integer threshold, 
+                                      only if OPTION_DEBUG (traces with higher level are 
+                                      not logged ; 0=Fatal, 1=Error, 2=Warning, 3=Info, 
+                                                   4=Trace, 5=Debug, ...) (def: 5)
+        - CMAKE_PREFIX_PATH:STRING	: Path prefixes for additional 3rdParty libraries (def:empty)
+                                      (use /usr/local if you compiled some 3rdParty libs yourself).
        - CMAKE_INSTALL_PREFIX:PATH	: Install path (def: /usr/local)
        - CMAKE_BUILD_TYPE:STRING	: Debug, Release, RelWithDebInfo, MinSizeRel (def: Release)

@ -128,11 +140,11 @@ The Speed Dreams Team.

    if default CMake settings were kept, Speed Dreams is normally installed in /usr/local :

-      $ speed-dreams
+      $ speed-dreams-2
      
-    or, if /usr/local/bin not already in your PATH :
+    or, if /usr/local/games not already in your PATH :
      
-      $ /usr/local/bin/speed-dreams
+      $ /usr/local/games/speed-dreams-2

 3 - Runtime options

@ -208,7 +220,9 @@ Note: If you use an "Express" version, don't forget to install also the Windows
        or be ready for headaches.


-2) MS VC++ 6 no more supported.
+2) MinGW : We want it ! Who can take care of the port :-?
+
+3) MS VC++ 6 : No more supported.

 III - FreeBSD installation from sources
 ---------------------------------------
--- a/README.txt
+++ b/README.txt
@ -48,9 +48,9 @@ or our Tracker (visit http://sourceforge.net/apps/trac and login to SF.net for t

 Car Setups
 ----------
-For the human player driver, the car parameters are located in the files :
- Linux   : ~/.speed-dreams-dev/drivers/human/car*.xml
- Windows : <My documents>\speed-dreams-dev.settings\drivers\human\car*.xml
+You can have you own version on the car setups for the human driver
+- Linux   : ~/.speed-dreams-2/drivers/human/...
+- Windows : <My documents>\speed-dreams-2.settings\human\...
 depending on the car used. You can change them with a text editor, 
 for more information look into the robot tutorial chapter 5
 (http://www.berniw.org/torcs/robot/ch5/properties.html).
--- a/cmake/macros.cmake
+++ b/cmake/macros.cmake
@ -28,9 +28,9 @@ ENDIF(NOT DEFINED IN_SOURCETREE)

 IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
  IF(WIN32)
-	  SET(CMAKE_INSTALL_PREFIX "C:/Program files/speed-dreams-dev" CACHE PATH "Prefix prepended to install directories" FORCE)
+	  SET(CMAKE_INSTALL_PREFIX "C:/Program files" CACHE PATH "Prefix prepended to install directories" FORCE)
  ELSE()
-    SET(CMAKE_INSTALL_PREFIX "/usr/local/dev" CACHE PATH "Prefix prepended to install directories" FORCE)
+    SET(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Prefix prepended to install directories" FORCE)
  ENDIF()
 ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)

@ -58,9 +58,15 @@ ELSE(IN_SOURCETREE)
 ENDIF(IN_SOURCETREE)

 IF(WIN32)
-	SET(SD_LOCALDIR "~/speed-dreams-dev.settings" CACHE DOC "Where the user settings files should go")
+	SET(SD_LOCALDIR "~/speed-dreams-2.settings" CACHE DOC "Where the user settings files should go")
 ELSE(WIN32) #UNIX
-	SET(SD_LOCALDIR "~/.speed-dreams-dev" CACHE DOC "Where the user settings files should go")
+	SET(SD_LOCALDIR "~/.speed-dreams-2" CACHE DOC "Where the user settings files should go")
+ENDIF(WIN32)
+
+IF(WIN32)
+	SET(SD_TOOLS_EXECPREFIX "sd2-" CACHE DOC "Prefix for the tools executable names")
+ELSE(WIN32) #UNIX
+	SET(SD_TOOLS_EXECPREFIX "sd2-" CACHE DOC "Prefix for the tools executable names")
 ENDIF(WIN32)

 IF(IN_SOURCETREE)
@ -70,15 +76,15 @@ IF(IN_SOURCETREE)
 		SET(_DEFLIBDIR "lib64")
 	ENDIF()
 	IF(WIN32)
-		SET(SD_BINDIR bin CACHE PATH "Place where the executables should go")
-		SET(SD_DATADIR data CACHE PATH "Place where all the static data files should go")
-		SET(SD_LIBDIR ${_DEFLIBDIR} CACHE PATH "Place where the libraries should go")
-		SET(SD_INCLUDEDIR include CACHE PATH "Place where the include files should go")
+		SET(SD_BINDIR speed-dreams-2/bin CACHE PATH "Place where the executables should go")
+		SET(SD_DATADIR speed-dreams-2/data CACHE PATH "Place where all the static data files should go")
+		SET(SD_LIBDIR speed-dreams-2/${_DEFLIBDIR} CACHE PATH "Place where the libraries should go")
+		SET(SD_INCLUDEDIR speed-dreams-2/include CACHE PATH "Place where the include files should go")
 	ELSE(WIN32) #UNIX
 		SET(SD_BINDIR games CACHE PATH "Place where the executables should go")
-		SET(SD_DATADIR share/games/speed-dreams CACHE PATH "Place where all the static data files should go")
-		SET(SD_LIBDIR ${_DEFLIBDIR}/games/speed-dreams CACHE PATH "Place where the libraries should go")
-		SET(SD_INCLUDEDIR include/speed-dreams CACHE PATH "Place where the include files should go")
+		SET(SD_DATADIR share/games/speed-dreams-2 CACHE PATH "Place where all the static data files should go")
+		SET(SD_LIBDIR ${_DEFLIBDIR}/games/speed-dreams-2 CACHE PATH "Place where the libraries should go")
+		SET(SD_INCLUDEDIR include/speed-dreams-2 CACHE PATH "Place where the include files should go")
 	ENDIF(WIN32)
 ELSE(IN_SOURCETREE)
 	SET(SD_DATADIR ${SD_DATADIR_ABS})
@ -1045,14 +1051,14 @@ ENDMACRO(SD_INSTALL_TRACK TRACKNAME CATEGORY)
 #  TARGETS  : Targets to install
 # Examples:
 #  SD_INSTALL_FILES(DATA drivers/bt FILES bt.xml logo.rgb)
-#     Installs bt.xml and logo.rgb in ${prefix}/share/games/speed-dreams/drivers/bt
+#     Installs bt.xml and logo.rgb in ${prefix}/${SD_DATADIR}/drivers/bt
 #  SD_INSTALL_FILES(DATA config/raceman USER config/raceman FILES quickrace.xml endrace.xml)
-#     Installs quickrace.xml and endrace.xml in ${prefix}/share/games/speed-dreams/drivers/bt
-#     and copies the file to the users settings folder ~/.speed-dreams/config/raceman at startup.
+#     Installs quickrace.xml and endrace.xml in ${prefix}/${SD_DATADIR}/drivers/bt
+#     and copies the file to the users settings folder ${SD_LOCALDIR}/config/raceman at startup.
 #  SD_INSTALL_FILES(LIB drivers/bt TARGETS bt.so)
-#     Installs bt.so in ${prefix}/lib/speed-dreams/drivers/bt
+#     Installs bt.so in ${prefix}/${SD_LIBDIR}/drivers/bt
 #  SD_INSTALL_FILES(BIN TARGETS speed-dreams)
-#     Installs the speed-dreams target in ${prefix}/games
+#     Installs the speed-dreams target in ${prefix}/${SD_BINDIR}
 MACRO(SD_INSTALL_FILES)

 	SET(SD_INSTALL_FILES_SYNTAX "DATA,1,1,IS_DATA,DATA_PATH")
--- a/cmake/packagemaker.cmake
+++ b/cmake/packagemaker.cmake
@ -1,5 +1,3 @@
-INCLUDE(InstallRequiredSystemLibraries)
-
 ##########################################################################################
 # Settings that are common to all target systems.

--- a/src/libs/tgf/tgf.cpp
+++ b/src/libs/tgf/tgf.cpp
@ -469,7 +469,7 @@ void GfRestart(bool bHardwareMouse, bool bMultiTexturing)
    int	argInd;

    // Command name.
-    sprintf(cmd, "%sspeed-dreams", GetBinDir());
+    sprintf(cmd, "%sspeed-dreams-2", GetBinDir());
 #ifdef WIN32
    strcat(cmd, ".exe");
 #endif
--- a/src/linux/CMakeLists.txt
+++ b/src/linux/CMakeLists.txt
@ -12,13 +12,13 @@ IF (COMMAND cmake_policy)
 	cmake_policy(SET CMP0003 NEW)
 ENDIF(COMMAND cmake_policy)

-ADD_EXECUTABLE(speed-dreams ${SD_SOURCES})
+ADD_EXECUTABLE(speed-dreams-2 ${SD_SOURCES})

-ADD_SDLIB_LIBRARY(speed-dreams client confscreens learning raceengineclient racescreens tgf tgfclient)
+ADD_SDLIB_LIBRARY(speed-dreams-2 client confscreens learning raceengineclient racescreens tgf tgfclient)

-ADD_PLIB_LIBRARY(speed-dreams sg ssg ul)
-ADD_DL_LIBRARY(speed-dreams)
+ADD_PLIB_LIBRARY(speed-dreams-2 sg ssg ul)
+ADD_DL_LIBRARY(speed-dreams-2)

-SD_INSTALL_FILES(BIN TARGETS speed-dreams)
+SD_INSTALL_FILES(BIN TARGETS speed-dreams-2)
 SD_INSTALL_FILES(INCLUDE FILES osspec.h)

--- a/src/tools/accc/CMakeLists.txt
+++ b/src/tools/accc/CMakeLists.txt
@ -1,11 +1,11 @@
 INCLUDE(../../../cmake/macros.cmake)
 PROJECT(accc)

-SET(ACCC_SOURCES ac3dgroup.cpp  ac3dload.cpp  mainaccc.cpp)
+SET(ACCC_SOURCES ac3dgroup.cpp ac3dload.cpp mainaccc.cpp)

 ADD_SDLIB_INCLUDEDIR(portability)

-ADD_EXECUTABLE(sd-accc ${ACCC_SOURCES})
+ADD_EXECUTABLE(${SD_TOOLS_EXECPREFIX}accc ${ACCC_SOURCES})

-SD_INSTALL_FILES(BIN TARGETS sd-accc)
+SD_INSTALL_FILES(BIN TARGETS ${SD_TOOLS_EXECPREFIX}accc)

--- a/src/tools/menuview/CMakeLists.txt
+++ b/src/tools/menuview/CMakeLists.txt
@ -1,5 +1,5 @@
 INCLUDE(../../../cmake/macros.cmake)
-PROJECT(sd-menuview)
+PROJECT(menuview)

 SET(MENUVIEW_SOURCES main.cpp previewmenu.cpp)

@ -14,26 +14,26 @@ if (COMMAND cmake_policy)
 endif(COMMAND cmake_policy)

 IF(UNIX)
-	ADD_EXECUTABLE(sd-menuview ${MENUVIEW_SOURCES} ../../linux/linuxspec.cpp)
+	ADD_EXECUTABLE(${SD_TOOLS_EXECPREFIX}menuview ${MENUVIEW_SOURCES} ../../linux/linuxspec.cpp)
 ENDIF(UNIX)

 IF (WIN32)	
-	ADD_EXECUTABLE(sd-menuview ${MENUVIEW_SOURCES} ../../windows/windowsspec.cpp)
+	ADD_EXECUTABLE(${SD_TOOLS_EXECPREFIX}menuview ${MENUVIEW_SOURCES} ../../windows/windowsspec.cpp)
 ENDIF(WIN32)


-ADD_SDLIB_LIBRARY(sd-menuview robottools tgf tgfclient client)
+ADD_SDLIB_LIBRARY(${SD_TOOLS_EXECPREFIX}menuview robottools tgf tgfclient client)


 IF(OPENGL_FOUND)
-	TARGET_LINK_LIBRARIES(sd-menuview ${OPENGL_LIBRARY})
+	TARGET_LINK_LIBRARIES(${SD_TOOLS_EXECPREFIX}menuview ${OPENGL_LIBRARY})
 ENDIF(OPENGL_FOUND)

-ADD_PNG_LIBRARY(sd-menuview)
-ADD_SDL_LIBRARY(sd-menuview)
+ADD_PNG_LIBRARY(${SD_TOOLS_EXECPREFIX}menuview)
+ADD_SDL_LIBRARY(${SD_TOOLS_EXECPREFIX}menuview)

-ADD_PLIB_LIBRARY(sd-menuview sg ssg ul)
-ADD_DL_LIBRARY(sd-menuview)
+ADD_PLIB_LIBRARY(${SD_TOOLS_EXECPREFIX}menuview sg ssg ul)
+ADD_DL_LIBRARY(${SD_TOOLS_EXECPREFIX}menuview)

-SD_INSTALL_FILES(BIN TARGETS sd-menuview)
+SD_INSTALL_FILES(BIN TARGETS ${SD_TOOLS_EXECPREFIX}menuview)

--- a/src/tools/nfs2ac/CMakeLists.txt
+++ b/src/tools/nfs2ac/CMakeLists.txt
@ -4,5 +4,5 @@ PROJECT(nfs2ac)

 SET(NFS2AC_SOURCES mainnfs2ac.cpp)

-ADD_EXECUTABLE(sd-nfs2ac ${NFS2AC_SOURCES})
-SD_INSTALL_FILES(BIN TARGETS sd-nfs2ac)
+ADD_EXECUTABLE(${SD_TOOLS_EXECPREFIX}nfs2ac ${NFS2AC_SOURCES})
+SD_INSTALL_FILES(BIN TARGETS ${SD_TOOLS_EXECPREFIX}nfs2ac)
--- a/src/tools/nfsperf/CMakeLists.txt
+++ b/src/tools/nfsperf/CMakeLists.txt
@ -10,12 +10,12 @@ IF (COMMAND cmake_policy)
 	cmake_policy(SET CMP0003 NEW)
 ENDIF(COMMAND cmake_policy)

-ADD_EXECUTABLE(sd-nfsperf ${NFSPERF_SOURCES})
+ADD_EXECUTABLE(${SD_TOOLS_EXECPREFIX}nfsperf ${NFSPERF_SOURCES})

-ADD_SDLIB_LIBRARY(sd-nfsperf tgf txml)
+ADD_SDLIB_LIBRARY(${SD_TOOLS_EXECPREFIX}nfsperf tgf txml)

 IF(UNIX)
-  TARGET_LINK_LIBRARIES(sd-nfsperf dl)
+  TARGET_LINK_LIBRARIES(${SD_TOOLS_EXECPREFIX}nfsperf dl)
 ENDIF(UNIX)

-SD_INSTALL_FILES(BIN TARGETS sd-nfsperf)
+SD_INSTALL_FILES(BIN TARGETS ${SD_TOOLS_EXECPREFIX}nfsperf)
--- a/src/tools/robots/robotgen.sh
+++ b/src/tools/robots/robotgen.sh
@ -6,7 +6,7 @@
 #    created              : Mon Jul 29 21:01:37 CEST 2002
 #    copyright            : (C) 2002 by Eric Espié                        
 #    email                : Eric.Espie@torcs.org   
-#    version              : $Id$                                  
+#    version              : $Id: sd-robotgen.sh 3254 2011-01-09 22:17:22Z pouillot $                                  
 #
 ##############################################################################
 #
--- a/src/tools/texmapper/CMakeLists.txt
+++ b/src/tools/texmapper/CMakeLists.txt
@ -10,22 +10,22 @@ ADD_OSSPEC_INCLUDEDIR()
 ADD_PLIB_INCLUDEDIR()

 #disable developer warning
-	if (COMMAND cmake_policy)
-		cmake_policy(SET CMP0003 NEW)
-	endif(COMMAND cmake_policy)
+IF (COMMAND cmake_policy)
+	cmake_policy(SET CMP0003 NEW)
+ENDIF(COMMAND cmake_policy)

-ADD_EXECUTABLE(sd-texmapper ${TEXMAPPER_SOURCES})
+ADD_EXECUTABLE(${SD_TOOLS_EXECPREFIX}texmapper ${TEXMAPPER_SOURCES})

-ADD_PLIB_LIBRARY(sd-texmapper sg ssg ul)
+ADD_PLIB_LIBRARY(${SD_TOOLS_EXECPREFIX}texmapper sg ssg ul)

-ADD_SDLIB_LIBRARY(sd-texmapper tgf tgfclient)
+ADD_SDLIB_LIBRARY(${SD_TOOLS_EXECPREFIX}texmapper tgf tgfclient)

+ADD_PNG_LIBRARY(${SD_TOOLS_EXECPREFIX}texmapper)

-ADD_PNG_LIBRARY(sd-texmapper)
 IF(UNIX)
-	ADD_X11_LIBRARY(sd-texmapper)
-	ADD_XRANDR_LIBRARY(sd-texmapper)
+	ADD_X11_LIBRARY(${SD_TOOLS_EXECPREFIX}texmapper)
+	ADD_XRANDR_LIBRARY(${SD_TOOLS_EXECPREFIX}texmapper)
 ENDIF(UNIX)

-SD_INSTALL_FILES(BIN TARGETS sd-texmapper)
+SD_INSTALL_FILES(BIN TARGETS ${SD_TOOLS_EXECPREFIX}texmapper)

--- a/src/tools/trackgen/CMakeLists.txt
+++ b/src/tools/trackgen/CMakeLists.txt
@ -1,4 +1,5 @@
 INCLUDE(../../../cmake/macros.cmake)
+
 PROJECT(trackgen)

 SET(TRACKGEN_SOURCES ac3d.cpp easymesh.cpp elevation.cpp maintrackgen.cpp
@ -12,9 +13,9 @@ ADD_SDL_INCLUDEDIR()
 ADD_INTERFACE_INCLUDEDIR()

 #disable developer warning
-if (COMMAND cmake_policy)
+IF (COMMAND cmake_policy)
 	cmake_policy(SET CMP0003 NEW)
-endif(COMMAND cmake_policy)
+ENDIF(COMMAND cmake_policy)

 IF(WIN32)
 	# Ignore some run-time libs to avoid link time warnings and sometimes even crashes.
@ -22,26 +23,23 @@ IF(WIN32)
 ENDIF(WIN32)

 IF(UNIX)
-	ADD_EXECUTABLE(sd-trackgen ${TRACKGEN_SOURCES} ../../linux/linuxspec.cpp)
+	ADD_EXECUTABLE(${SD_TOOLS_EXECPREFIX}trackgen ${TRACKGEN_SOURCES} ../../linux/linuxspec.cpp)
 ENDIF(UNIX)

 IF (WIN32)	
-	ADD_EXECUTABLE(sd-trackgen ${TRACKGEN_SOURCES} ../../windows/windowsspec.cpp)
+	ADD_EXECUTABLE(${SD_TOOLS_EXECPREFIX}trackgen ${TRACKGEN_SOURCES} ../../windows/windowsspec.cpp)
 ENDIF(WIN32)

-
-ADD_SDLIB_LIBRARY(sd-trackgen robottools tgf tgfclient client)
-
+ADD_SDLIB_LIBRARY(${SD_TOOLS_EXECPREFIX}trackgen robottools tgf tgfclient client)

 IF(OPENGL_FOUND)
-	TARGET_LINK_LIBRARIES(sd-trackgen ${OPENGL_LIBRARY})
+	TARGET_LINK_LIBRARIES(${SD_TOOLS_EXECPREFIX}trackgen ${OPENGL_LIBRARY})
 ENDIF(OPENGL_FOUND)

-ADD_PNG_LIBRARY(sd-trackgen)
-ADD_SDL_LIBRARY(sd-trackgen)
+ADD_PNG_LIBRARY(${SD_TOOLS_EXECPREFIX}trackgen)
+ADD_SDL_LIBRARY(${SD_TOOLS_EXECPREFIX}trackgen)
+ADD_PLIB_LIBRARY(${SD_TOOLS_EXECPREFIX}trackgen sg ssg ul)
+ADD_DL_LIBRARY(${SD_TOOLS_EXECPREFIX}trackgen)

-ADD_PLIB_LIBRARY(sd-trackgen sg ssg ul)
-ADD_DL_LIBRARY(sd-trackgen)
-
-SD_INSTALL_FILES(BIN TARGETS sd-trackgen)
+SD_INSTALL_FILES(BIN TARGETS ${SD_TOOLS_EXECPREFIX}trackgen)

--- a/src/windows/CMakeLists.txt
+++ b/src/windows/CMakeLists.txt
@ -14,16 +14,16 @@ if (COMMAND cmake_policy)
 	cmake_policy(SET CMP0003 NEW)
 endif(COMMAND cmake_policy)

-ADD_EXECUTABLE(speed-dreams ${SD_SOURCES})
+ADD_EXECUTABLE(speed-dreams-2 ${SD_SOURCES})

 include_directories(../libs)
-ADD_SDLIB_LIBRARY(speed-dreams client tgf ssggraph)
+ADD_SDLIB_LIBRARY(speed-dreams-2 client tgf ssggraph)

-ADD_PLIB_LIBRARY(speed-dreams sg ssg ul)
+ADD_PLIB_LIBRARY(speed-dreams-2 sg ssg ul)

 SD_INSTALL_FILES(INCLUDE FILES osspec.h)

-SD_INSTALL_FILES(BIN TARGETS speed-dreams)
+SD_INSTALL_FILES(BIN TARGETS speed-dreams-2)

 # Install OpenAL and SDL DLLs close to Speed Dreams executable
 FIND_PACKAGE(OpenAL)