Samples: Enhance the newplatforms sample

jamplus · Feb 6, 2017 · d56423b · d56423b
1 parent 93ac31f
commit d56423b
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 8 deletions.
diff --git a/samples/newplatforms/CreateJamVS2012Workspace.bat b/samples/newplatforms/CreateJamVS2012Workspace.bat
diff --git a/samples/newplatforms/CreateJamWorkspace.bat b/samples/newplatforms/CreateJamWorkspace.bat
@@ -0,0 +1,2 @@
+@jam --workspace -gui --config=%~dp0CreateJamWorkspace.config
+
diff --git a/...platforms/CreateJamVS2012Workspace.config → ...es/newplatforms/CreateJamWorkspace.config b/...platforms/CreateJamVS2012Workspace.config → ...es/newplatforms/CreateJamWorkspace.config
diff --git a/samples/newplatforms/helloworld.c b/samples/newplatforms/helloworld.c
@@ -3,9 +3,17 @@
 int main()
 {
 #if defined(PLATFORM_WIN32DX)
-	printf("Hello from win32-dx!\n");
+#if defined(CONFIG_DEBUG)
+	printf("Hello from win32-dx debug!\n");
+#elif defined(CONFIG_RELEASE)
+	printf("Hello from win32-dx release!\n");
+#endif // CONFIG_RELEASE
 #elif defined(PLATFORM_WIN32OGL)
-	printf("Hello from win32-ogl!\n");
+#if defined(CONFIG_DEBUG)
+	printf("Hello from win32-ogl debug!\n");
+#elif defined(CONFIG_RELEASE)
+	printf("Hello from win32-ogl release!\n");
+#endif // CONFIG_RELEASE
 #endif
 	return 0;
 }
diff --git a/samples/newplatforms/jam/c/toolchain/win32dx/debug.jam b/samples/newplatforms/jam/c/toolchain/win32dx/debug.jam
@@ -1,4 +1,5 @@
 rule C.Toolchain.win32dx-debug.* {
-    C.ToolchainSpecKeys C.PLATFORM C.CONFIG ;
+    C.ToolchainSpecKeys C.PLATFORM/PLATFORM C.CONFIG/CONFIG ;
     C.Toolchain.win32dx.* ;
+    C.Defines * : CONFIG_DEBUG ;
 }
diff --git a/samples/newplatforms/jam/c/toolchain/win32dx/release.jam b/samples/newplatforms/jam/c/toolchain/win32dx/release.jam
@@ -1,4 +1,5 @@
 rule C.Toolchain.win32dx-release.* {
-    C.ToolchainSpecKeys C.PLATFORM C.CONFIG ;
+    C.ToolchainSpecKeys C.PLATFORM/PLATFORM C.CONFIG/CONFIG ;
     C.Toolchain.win32dx.* ;
+    C.Defines * : CONFIG_RELEASE ;
 }
diff --git a/samples/newplatforms/jam/c/toolchain/win32ogl/debug.jam b/samples/newplatforms/jam/c/toolchain/win32ogl/debug.jam
@@ -1,4 +1,5 @@
 rule C.Toolchain.win32ogl.debug.* {
-    C.ToolchainSpecKeys C.PLATFORM C.CONFIG ;
+    C.ToolchainSpecKeys C.PLATFORM/PLATFORM C.CONFIG/CONFIG ;
     C.Toolchain.win32ogl.* ;
+    C.Defines * : CONFIG_DEBUG ;
 }
diff --git a/samples/newplatforms/jam/c/toolchain/win32ogl/release.jam b/samples/newplatforms/jam/c/toolchain/win32ogl/release.jam
@@ -1,4 +1,5 @@
 rule C.Toolchain.win32ogl.release.* {
-    C.ToolchainSpecKeys C.PLATFORM C.CONFIG ;
+    C.ToolchainSpecKeys C.PLATFORM/PLATFORM C.CONFIG/CONFIG ;
     C.Toolchain.win32ogl.* ;
+    C.Defines * : CONFIG_RELEASE ;
 }