Remove support for building/packaging two binaries

2 files changed, 16 insertions, 50 deletions

diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index 6c0eafe5..5a8513c5 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -3,9 +3,8 @@
 ; like the old install script.
 ;
 ; DLLDIR - directory containing required dlls
-; EXEDIR - directory containing mana.exe (and maybe mana-ea.exe)
+; EXEDIR - directory containing mana.exe
 ; EXESUFFIX - offset to SRCDIR pointing to a directory containing mana.exe
-; COMBINED_BUILD - set to one to include mana.exe and mana-ea.exe
 ; PRODUCT_VERSION - software version
 ; UPX - upx binary name
 ;
@@ -38,9 +37,6 @@ SetCompressor /SOLID lzma
 
 ;--- (and without !defines ) ---
 !System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\mana.exe"
-!ifdef COMBINED_BUILD
-  !System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\mana-ea.exe"
-!endif
 
 ; HM NIS Edit helper defines
 !define PRODUCT_NAME "Mana"
@@ -50,9 +46,6 @@ SetCompressor /SOLID lzma
 !define PRODUCT_PUBLISHER "Mana Development Team"
 !define PRODUCT_WEB_SITE "http://manasource.org"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\mana.exe"
-!ifdef COMBINED_BUILD
-!define PRODUCT_DIR_REGKEY_EA "Software\Microsoft\Windows\CurrentVersion\App Paths\mana-ea.exe"
-!endif
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
 
@@ -173,9 +166,6 @@ Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
 OutFile "mana-${PRODUCT_VERSION}-win32.exe"
 InstallDir "$PROGRAMFILES\Mana"
 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
-!ifdef COMBINED_BUILD
-  InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY_EA}" ""
-!endif
 ShowInstDetails show
 ShowUnInstDetails show
 
@@ -192,10 +182,6 @@ Section "Core files (required)" SecCore
   CreateDirectory "$SMPROGRAMS\Mana"
   CreateShortCut "$SMPROGRAMS\Mana\Mana.lnk" "$INSTDIR\mana.exe"
   CreateShortCut "$DESKTOP\Mana.lnk" "$INSTDIR\mana.exe"
-  !ifdef COMBINED_BUILD
-    CreateShortCut "$SMPROGRAMS\Mana\Mana (Eathena).lnk" "$INSTDIR\mana-ea.exe"
-    CreateShortCut "$DESKTOP\Mana (Eathena).lnk" "$INSTDIR\mana-ea.exe"
-  !endif
   CreateDirectory "$INSTDIR\data"
   CreateDirectory "$INSTDIR\data\fonts"
   CreateDirectory "$INSTDIR\data\graphics"
@@ -209,9 +195,6 @@ Section "Core files (required)" SecCore
   SetOutPath "$INSTDIR"
 
   File "${EXEDIR}\mana.exe"
-  !ifdef COMBINED_BUILD
-    File "${EXEDIR}\mana-ea.exe"
-  !endif
   File "${DLLDIR}\*.dll"
   File "${SRCDIR}\AUTHORS"
   File "${SRCDIR}\COPYING"
@@ -273,10 +256,6 @@ Section -Post
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
-  !ifdef COMBINED_BUILD
-    WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\mana-ea.exe"
-    WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\mana-ea.exe"
-  !endif
 SectionEnd
 
 Function un.onInit
@@ -291,10 +270,6 @@ Section Uninstall
   Delete "$SMPROGRAMS\Mana\Uninstall.lnk"
   Delete "$DESKTOP\Mana.lnk"
   Delete "$SMPROGRAMS\Mana\Mana.lnk"
-  !ifdef COMBINED_BUILD
-    Delete "$DESKTOP\Mana (Eathena).lnk"
-    Delete "$SMPROGRAMS\Mana\Mana (Eathena).lnk"
-  !endif
   Delete "$SMPROGRAMS\Mana\Website.lnk"
   Delete "$SMPROGRAMS\Mana\Readme.lnk"
   Delete "$SMPROGRAMS\Mana\FAQ.lnk"
@@ -309,8 +284,5 @@ Section Uninstall
 
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
   DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
-  !ifdef COMBINED_BUILD
-    DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
-  !endif
   SetAutoClose true
 SectionEnd
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 68d7b064..1a25d04b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -586,38 +586,32 @@ SET(SRCS_MANA
 
 IF (WIN32)
     SET(SRCS_MANA ${SRCS_MANA} mana.rc)
-    SET(SRCS_EA ${SRCS_EA} mana-ea.rc)
 ENDIF ()
 
 SET (PROGRAMS mana)
 
 ADD_EXECUTABLE(mana WIN32 ${SRCS} ${SRCS_MANA} ${SRCS_EA})
-#ADD_EXECUTABLE(mana-ea WIN32 ${SRCS} ${SRCS_EA})
 
-FOREACH(program ${PROGRAMS})
-    TARGET_LINK_LIBRARIES(${program} ${SDL_LIBRARY}
-        ${SDLIMAGE_LIBRARY}
-        ${SDLMIXER_LIBRARY}
-        ${SDLNET_LIBRARY}
-        ${SDLTTF_LIBRARY}
-        ${ENET_LIBRARIES}
-        ${PNG_LIBRARIES}
-        ${PHYSFS_LIBRARY}
-        ${CURL_LIBRARIES}
-        ${LIBXML2_LIBRARIES}
-        ${GUICHAN_LIBRARIES}
-        ${OPENGL_LIBRARIES}
-        ${LIBINTL_LIBRARIES}
-        ${EXTRA_LIBRARIES})
-    INSTALL(TARGETS ${program} RUNTIME DESTINATION ${PKG_BINDIR})
-ENDFOREACH(program)
+TARGET_LINK_LIBRARIES(mana ${SDL_LIBRARY}
+    ${SDLIMAGE_LIBRARY}
+    ${SDLMIXER_LIBRARY}
+    ${SDLNET_LIBRARY}
+    ${SDLTTF_LIBRARY}
+    ${ENET_LIBRARIES}
+    ${PNG_LIBRARIES}
+    ${PHYSFS_LIBRARY}
+    ${CURL_LIBRARIES}
+    ${LIBXML2_LIBRARIES}
+    ${GUICHAN_LIBRARIES}
+    ${OPENGL_LIBRARIES}
+    ${LIBINTL_LIBRARIES}
+    ${EXTRA_LIBRARIES})
+INSTALL(TARGETS mana RUNTIME DESTINATION ${PKG_BINDIR})
 
 IF (CMAKE_SYSTEM_NAME STREQUAL SunOS)
     # we expect the SMCgtxt package to be present on Solaris;
     # the Solaris gettext is not API-compatible to GNU gettext
     SET_TARGET_PROPERTIES(mana PROPERTIES LINK_FLAGS "-L/usr/local/lib")
-    #SET_TARGET_PROPERTIES(mana-ea PROPERTIES LINK_FLAGS "-L/usr/local/lib")
 ENDIF()
 
 SET_TARGET_PROPERTIES(mana PROPERTIES COMPILE_FLAGS "${FLAGS_MANA}")
-#SET_TARGET_PROPERTIES(mana-ea PROPERTIES COMPILE_FLAGS "${FLAGS_EA}")