Simplify naming

.travis.yml

@@ -13,9 +13,9 @@ before_install:
   - sudo apt-get install -y libxrandr-dev
 
 script:
-  - make engine-linux-debug64 && ./build/engine/linux64/bin/crown-debug-64 --run-unit-tests
-  - make engine-linux-development64 && ./build/engine/linux64/bin/crown-development-64 --run-unit-tests
-  - make engine-linux-release64
+  - make engine-linux-debug64       && ./build/engine/linux64/bin/crown-debug --run-unit-tests
+  - make engine-linux-development64 && ./build/engine/linux64/bin/crown-development --run-unit-tests
+  - make engine-linux-release64     && ./build/engine/linux64/bin/crown-release --run-unit-tests
 
 notifications:
   email: false

scripts/toolchain.lua

@@ -77,35 +77,20 @@ function toolchain(build_dir, lib_dir)
 		"__STDC_LIMIT_MACROS",
 	}
 
-	configuration { "development or release" }
-		flags {
-			"OptimizeSpeed"
-		}
-
-	configuration { "debug", "x32" }
-		targetsuffix "-debug-32"
-	configuration { "debug", "x64" }
-		targetsuffix "-debug-64"
-
-	configuration { "development", "x32" }
-		targetsuffix "-development-32"
-	configuration { "development", "x64" }
-		targetsuffix "-development-64"
-
-	configuration { "release", "x32" }
-		targetsuffix "-release-32"
-	configuration { "release", "x64" }
-		targetsuffix "-release-64"
-
-	configuration { "debug", "native" }
+	configuration { "debug" }
 		targetsuffix "-debug"
 
-	configuration { "development", "native" }
+	configuration { "development" }
 		targetsuffix "-development"
 
-	configuration { "release", "native" }
+	configuration { "release" }
 		targetsuffix "-release"
 
+	configuration { "development or release" }
+		flags {
+			"OptimizeSpeed"
+		}
+
 	configuration { "debug or development", "linux-*" }
 		linkoptions {
 			"-rdynamic"

src/resource/shader_resource.cpp

@@ -17,21 +17,17 @@
 #include "temp_allocator.h"
 
 #if CROWN_DEVELOPMENT
-	#define SHADERC_NAME "shaderc-development-"
+	#define SHADERC_NAME "shaderc-development"
 #elif CROWN_DEBUG
-	#define SHADERC_NAME "shaderc-debug-"
+	#define SHADERC_NAME "shaderc-debug"
 #else
-	#define SHADERC_NAME "shaderc-release-"
+	#define SHADERC_NAME "shaderc-release"
 #endif  // CROWN_DEBUG
-#if CROWN_ARCH_32BIT
-	#define SHADERC_BITS "32"
-#elif CROWN_ARCH_64BIT
-	#define SHADERC_BITS "64"
-#endif // CROWN_ARCH_32BIT
+
 #if CROWN_PLATFORM_LINUX
-	#define SHADERC_PATH "./" SHADERC_NAME "" SHADERC_BITS
+	#define SHADERC_PATH "./" SHADERC_NAME ""
 #elif CROWN_PLATFORM_WINDOWS
-	#define SHADERC_PATH SHADERC_NAME "" SHADERC_BITS ".exe"
+	#define SHADERC_PATH SHADERC_NAME ".exe"
 #else
 	#define SHADERC_PATH ""
 #endif // CROWN_PLATFORM_LINUX

src/resource/texture_resource.cpp

@@ -14,21 +14,17 @@
 #include "texture_resource.h"
 
 #if CROWN_DEVELOPMENT
-	#define TEXTUREC_NAME "texturec-development-"
+	#define TEXTUREC_NAME "texturec-development"
 #elif CROWN_DEBUG
-	#define TEXTUREC_NAME "texturec-debug-"
+	#define TEXTUREC_NAME "texturec-debug"
 #else
-	#define TEXTUREC_NAME "texturec-release-"
+	#define TEXTUREC_NAME "texturec-release"
 #endif  // CROWN_DEBUG
-#if CROWN_ARCH_32BIT
-	#define TEXTUREC_BITS "32"
-#elif CROWN_ARCH_64BIT
-	#define TEXTUREC_BITS "64"
-#endif // CROWN_ARCH_32BIT
+
 #if CROWN_PLATFORM_LINUX
-	#define TEXTUREC_PATH "./" TEXTUREC_NAME "" TEXTUREC_BITS
+	#define TEXTUREC_PATH "./" TEXTUREC_NAME ""
 #elif CROWN_PLATFORM_WINDOWS
-	#define TEXTUREC_PATH TEXTUREC_NAME "" TEXTUREC_BITS ".exe"
+	#define TEXTUREC_PATH TEXTUREC_NAME ".exe"
 #else
 	#define TEXTUREC_PATH ""
 #endif // CROWN_PLATFORM_LINUX

tools/config.vala

@@ -16,7 +16,7 @@ namespace Crown
 	const string EXE_PREFIX = "";
 	const string EXE_SUFFIX = ".exe";
 #endif
-	const string ENGINE_EXE = EXE_PREFIX + "crown-development-64" + EXE_SUFFIX;
+	const string ENGINE_EXE = EXE_PREFIX + "crown-development" + EXE_SUFFIX;
 
 	const uint16 CROWN_DEFAULT_SERVER_PORT = 10618;