Using different umodel.exe file name for different targets

Author: gildor2

.gitignore

@@ -31,7 +31,8 @@ umodel.cfg
 !.vs/tasks.vs.json
 
 # Executable files and pdb
-umodel.pdb
+umodel[-_]*.exe
+umodel*.pdb
 SDL2.dll
 Tools/**/*.exe
 Tools/**/*.pdb

.vscode/c_cpp_properties.json

@@ -11,21 +11,21 @@
             "name": "Win32-Debug",
             "customConfigurationVariables": {
                 "BuildOptions": "--debug",
-				"ExeName": "umodel.exe"
+				"ExeName": "umodel-debug.exe"
 			}
         },
         {
             "name": "Win64-Release",
             "customConfigurationVariables": {
                 "BuildOptions": "--64",
-				"ExeName": "umodel.exe"
+				"ExeName": "umodel_64.exe"
 			}
         },
         {
             "name": "Win64-Debug",
             "customConfigurationVariables": {
                 "BuildOptions": "--64 --debug",
-				"ExeName": "umodel.exe"
+				"ExeName": "umodel-debug_64.exe"
 			}
         }
     ],

UmodelTool/umodel.project

@@ -39,4 +39,9 @@ sources(MAIN) = {
 !endif
 }
 
-target(executable, $PRJ, MAIN + COMP_LIBS + UE4_LIBS + IMG_LIBS + NV_LIBS + MOBILE_LIBS, MAIN)
+!if !defined(EXE_NAME)
+	EXE_NAME = $PRJ
+	!message NO EXE_NAME
+!endif
+
+target(executable, $EXE_NAME, MAIN + COMP_LIBS + UE4_LIBS + IMG_LIBS + NV_LIBS + MOBILE_LIBS, MAIN)

build.sh

@@ -46,13 +46,18 @@ function DebugPrint()
 }
 
 #-------------------------------------------------------------
-# Setup default project when running this script directly
+# Setup default project when running this script directly. Used to build UmodelTool.
 
 function SetupDefaultProject()
 {
-	[ "$project" ] || project="UmodelTool/umodel"		# setup default project name
-	[ "$root"    ] || root="."
-	[ "$render"  ] || render=1
+	project="UmodelTool/umodel"
+	root="."
+	render=1
+	local ExeName="umodel"
+	[ "$debug" ] && ExeName+="-debug"
+	[ "$profile" ] && ExeName+="-profile"
+	[ "$PLATFORM" == "vc-win64" ] && ExeName+="_64"
+	GENMAKE_OPTIONS+=" EXE_NAME=$ExeName"
 }
 
 #-------------------------------------------------------------
@@ -123,7 +128,7 @@ function DetectVisualStudioVersion()
 	# Adjust vc_ver to found one
 	vc_ver=$found_vc_year
 	DebugPrint "Found: Visual Studio $found_vc_year at \"$workpath\", Version = $vc_ver"
-	GENMAKE_OPTIONS=VC_VER=$vc_ver					# specify compiler for genmake script
+	GENMAKE_OPTIONS+=" VC_VER=$vc_ver"				# specify compiler for genmake script
 }
 
 #-------------------------------------------------------------
@@ -224,7 +229,7 @@ EOF
 
 #-------------------------------------------------------------
 
-SetupDefaultProject
+[ "$project" ] || SetupDefaultProject
 GetBuildNumber
 DetectBuildPlatform
 

common.project

@@ -4,13 +4,13 @@ LIBC       = shared
 #MAPFILES   = 1
 CONSOLE    = 1
 
-!if !defined($OPTIMIZE)		# allow overriding of OPTIMIZE in parent project
+!if !defined(OPTIMIZE)		# allow overriding of OPTIMIZE in parent project
 OPTIMIZE   = size
 !endif
 
 PDB        = 2				# keep enabled, executable is almost the same, except embedded link to pdb file
 
-!if !defined($OLDCRT)		# allow overriding of OLDCRT in parent project
+!if !defined(OLDCRT)		# allow overriding of OLDCRT in parent project
 OLDCRT     = 0				# set to 0 (or comment the line) to use "native" compiler's CRT
 							# Changed 29.05.2021: Oodle static libraries requires more modern CRT which is not available in MSVCRT.dll
 !endif
@@ -33,7 +33,7 @@ CPP_STD = c++14				# allow modern C++ features
 							#!! todo: the standard has been changed for clang on macOS, check for "CPP_STD" below!
 
 !if "$COMPILER" eq "VisualC"
-	!if !defined($CPP_EXCEPT)
+	!if !defined(CPP_EXCEPT)
 		CPP_EXCEPT = 0									# used with WIN32_USE_SEH in Core.h
 	!endif
 	WINXP      = 1										# we're not using any modern Win32 features, so allow to worn at WinXP
@@ -198,7 +198,7 @@ STDLIBS   += SDL2		# disabled in macOS build
 INCLUDES  += . $R/Core $R/Unreal $LIBINCLUDES
 OPTIONS   += $WARNINGS
 
-!if defined($DEBUG)
+!if defined(DEBUG)
 	DEFINES += MAX_DEBUG
 	OBJDIR  = $OBJDIR-debug
 	OPTIMIZE = none