Merge branch 'bright_boson_2.1RC' into mainnet

BeamMW · May 14, 2019 · c8423bc · c8423bc
2 parents cfad38e + 09e9064
commit c8423bc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -139,13 +139,6 @@ if(SHOW_CODE_LOCATION)
     add_definitions(-DSHOW_CODE_LOCATION=1)
 endif()
 
-# comment next if block to avoid styling by branchname
-if(BRANCH_NAME MATCHES "testnet")
-    add_definitions(-DBEAM_TESTNET)
-elseif(BRANCH_NAME MATCHES "mainnet")
-    add_definitions(-DBEAM_MAINNET)
-endif()
-
 # uncoment next line for testnet
 #set(BEAM_TESTNET TRUE)
 # uncoment next line for mainnet

diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
@@ -24,6 +24,7 @@ function(BEAM_TRANSLATIONS_COMPILE_QM ts_files out_qm_files)
     set(${out_qm_files} ${QM_FILES} PARENT_SCOPE)
 endfunction()
 
+set(APP_NAME "Beam Wallet${BEAM_DISPLAY_SUFFIX}")
 if(LINUX)
     set (OUTPUT_NAME "BeamWallet${BEAM_SUFFIX_UPPER_CASE}")
 else()
@@ -132,7 +133,7 @@ elseif(BEAM_MAINNET)
     set(BEAM_ICON_SUFFIX "mainnet")
 endif()
 
-add_definitions(-DAPP_NAME=\"${OUTPUT_NAME}\")
+add_definitions(-DAPP_NAME=\"${APP_NAME}\")
 
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/icons/icon_${BEAM_ICON_SUFFIX}.ico
           ${CMAKE_CURRENT_SOURCE_DIR}/icons/beam_${BEAM_ICON_SUFFIX}.png