浏览代码

Removing additional references to EMP

Missed some references to EMP from build mechanisms that I hadn't been
using (relied only on the CMake-based build for the tutorials).

I removed the references to EMPCore in these build files (which,
fortunately, already check for RocketCore as a replacement) and also
updated a couple of references to EMP_PLATFORM_WIN32 in the tutorials'
macros.
Noam Chitayat 13 年之前
父节点
当前提交
4c19d0d454

+ 2 - 2
Samples/tutorial/datagrid/Datagrid.vcproj

@@ -55,7 +55,7 @@
 			/>
 			/>
 			<Tool
 			<Tool
 				Name="VCLinkerTool"
 				Name="VCLinkerTool"
-				AdditionalDependencies="EMPCore_d.lib RocketCore_d.lib RocketControls_d.lib RocketDebugger_d.lib libpng_d.lib zlib_d.lib opengl32.lib"
+				AdditionalDependencies="RocketCore_d.lib RocketControls_d.lib RocketDebugger_d.lib libpng_d.lib zlib_d.lib opengl32.lib"
 				OutputFile="..\..\..\..\..\packages\bin\$(ProjectName)_d.exe"
 				OutputFile="..\..\..\..\..\packages\bin\$(ProjectName)_d.exe"
 				AdditionalLibraryDirectories="..\..\shell\libpng;..\..\..\..\..\packages\bin"
 				AdditionalLibraryDirectories="..\..\shell\libpng;..\..\..\..\..\packages\bin"
 				GenerateDebugInformation="true"
 				GenerateDebugInformation="true"
@@ -124,7 +124,7 @@
 			/>
 			/>
 			<Tool
 			<Tool
 				Name="VCLinkerTool"
 				Name="VCLinkerTool"
-				AdditionalDependencies="EMPCore.lib RocketCore.lib RocketControls.lib RocketDebugger.lib libpng.lib zlib.lib opengl32.lib"
+				AdditionalDependencies="RocketCore.lib RocketControls.lib RocketDebugger.lib libpng.lib zlib.lib opengl32.lib"
 				OutputFile="..\..\..\..\..\packages\bin\$(ProjectName).exe"
 				OutputFile="..\..\..\..\..\packages\bin\$(ProjectName).exe"
 				AdditionalLibraryDirectories="..\..\shell\libpng;..\..\..\..\..\packages\bin"
 				AdditionalLibraryDirectories="..\..\shell\libpng;..\..\..\..\..\packages\bin"
 				SubSystem="2"
 				SubSystem="2"

+ 0 - 1
Samples/tutorial/datagrid/SConstruct

@@ -19,7 +19,6 @@ LIBS = Split( """
 	RocketControls
 	RocketControls
 	RocketDebugger
 	RocketDebugger
 	RocketCore
 	RocketCore
-	EMPCore
 	Shell
 	Shell
 	""" )
 	""" )
 
 

+ 1 - 1
Samples/tutorial/datagrid/src/main.cpp

@@ -29,7 +29,7 @@ void GameLoop()
 	Shell::FlipBuffers();
 	Shell::FlipBuffers();
 }
 }
 
 
-#if defined EMP_PLATFORM_WIN32
+#if defined ROCKET_PLATFORM_WIN32
 #include <windows.h>
 #include <windows.h>
 int APIENTRY WinMain(HINSTANCE ROCKET_UNUSED(instance_handle), HINSTANCE ROCKET_UNUSED(previous_instance_handle), char* ROCKET_UNUSED(command_line), int ROCKET_UNUSED(command_show))
 int APIENTRY WinMain(HINSTANCE ROCKET_UNUSED(instance_handle), HINSTANCE ROCKET_UNUSED(previous_instance_handle), char* ROCKET_UNUSED(command_line), int ROCKET_UNUSED(command_show))
 #else
 #else

+ 2 - 2
Samples/tutorial/datagrid_tree/DatagridTree.vcproj

@@ -55,7 +55,7 @@
 			/>
 			/>
 			<Tool
 			<Tool
 				Name="VCLinkerTool"
 				Name="VCLinkerTool"
-				AdditionalDependencies="EMPCore_d.lib RocketCore_d.lib RocketControls_d.lib RocketDebugger_d.lib libpng_d.lib zlib_d.lib opengl32.lib"
+				AdditionalDependencies="RocketCore_d.lib RocketControls_d.lib RocketDebugger_d.lib libpng_d.lib zlib_d.lib opengl32.lib"
 				OutputFile="..\..\..\..\..\packages\bin\$(ProjectName)_d.exe"
 				OutputFile="..\..\..\..\..\packages\bin\$(ProjectName)_d.exe"
 				AdditionalLibraryDirectories="..\..\shell\libpng;..\..\..\..\..\packages\bin"
 				AdditionalLibraryDirectories="..\..\shell\libpng;..\..\..\..\..\packages\bin"
 				GenerateDebugInformation="true"
 				GenerateDebugInformation="true"
@@ -124,7 +124,7 @@
 			/>
 			/>
 			<Tool
 			<Tool
 				Name="VCLinkerTool"
 				Name="VCLinkerTool"
-				AdditionalDependencies="EMPCore.lib RocketCore.lib RocketControls.lib RocketDebugger.lib libpng.lib zlib.lib opengl32.lib"
+				AdditionalDependencies="RocketCore.lib RocketControls.lib RocketDebugger.lib libpng.lib zlib.lib opengl32.lib"
 				OutputFile="..\..\..\..\..\packages\bin\$(ProjectName).exe"
 				OutputFile="..\..\..\..\..\packages\bin\$(ProjectName).exe"
 				AdditionalLibraryDirectories="..\..\shell\libpng;..\..\..\..\..\packages\bin"
 				AdditionalLibraryDirectories="..\..\shell\libpng;..\..\..\..\..\packages\bin"
 				SubSystem="2"
 				SubSystem="2"

+ 0 - 1
Samples/tutorial/datagrid_tree/SConstruct

@@ -19,7 +19,6 @@ LIBS = Split( """
 	RocketControls
 	RocketControls
 	RocketDebugger
 	RocketDebugger
 	RocketCore
 	RocketCore
-	EMPCore
 	Shell
 	Shell
 	""" )
 	""" )
 
 

+ 1 - 1
Samples/tutorial/datagrid_tree/src/main.cpp

@@ -30,7 +30,7 @@ void GameLoop()
 	Shell::FlipBuffers();
 	Shell::FlipBuffers();
 }
 }
 
 
-#if defined EMP_PLATFORM_WIN32
+#if defined ROCKET_PLATFORM_WIN32
 #include <windows.h>
 #include <windows.h>
 int APIENTRY WinMain(HINSTANCE ROCKET_UNUSED(instance_handle), HINSTANCE ROCKET_UNUSED(previous_instance_handle), char* ROCKET_UNUSED(command_line), int ROCKET_UNUSED(command_show))
 int APIENTRY WinMain(HINSTANCE ROCKET_UNUSED(instance_handle), HINSTANCE ROCKET_UNUSED(previous_instance_handle), char* ROCKET_UNUSED(command_line), int ROCKET_UNUSED(command_show))
 #else
 #else

+ 0 - 1
Samples/tutorial/template/SConstruct

@@ -18,7 +18,6 @@ INCLUDE = Split( """
 LIBS = Split( """
 LIBS = Split( """
 	RocketDebugger
 	RocketDebugger
 	RocketCore
 	RocketCore
-	EMPCore
 	Shell
 	Shell
 	""" )
 	""" )
 
 

+ 2 - 2
Samples/tutorial/template/Template.vcproj

@@ -55,7 +55,7 @@
 			/>
 			/>
 			<Tool
 			<Tool
 				Name="VCLinkerTool"
 				Name="VCLinkerTool"
-				AdditionalDependencies="EMPCore_d.lib RocketCore_d.lib RocketControls_d.lib RocketDebugger_d.lib libpng_d.lib zlib_d.lib opengl32.lib"
+				AdditionalDependencies="RocketCore_d.lib RocketControls_d.lib RocketDebugger_d.lib libpng_d.lib zlib_d.lib opengl32.lib"
 				OutputFile="..\..\..\..\..\packages\bin\$(ProjectName)_d.exe"
 				OutputFile="..\..\..\..\..\packages\bin\$(ProjectName)_d.exe"
 				AdditionalLibraryDirectories="..\..\shell\libpng;..\..\..\..\..\packages\bin"
 				AdditionalLibraryDirectories="..\..\shell\libpng;..\..\..\..\..\packages\bin"
 				GenerateDebugInformation="true"
 				GenerateDebugInformation="true"
@@ -124,7 +124,7 @@
 			/>
 			/>
 			<Tool
 			<Tool
 				Name="VCLinkerTool"
 				Name="VCLinkerTool"
-				AdditionalDependencies="EMPCore.lib RocketCore.lib RocketControls.lib RocketDebugger.lib libpng.lib zlib.lib opengl32.lib"
+				AdditionalDependencies="RocketCore.lib RocketControls.lib RocketDebugger.lib libpng.lib zlib.lib opengl32.lib"
 				OutputFile="..\..\..\..\..\packages\bin\$(ProjectName).exe"
 				OutputFile="..\..\..\..\..\packages\bin\$(ProjectName).exe"
 				AdditionalLibraryDirectories="..\..\shell\libpng;..\..\..\..\..\packages\bin"
 				AdditionalLibraryDirectories="..\..\shell\libpng;..\..\..\..\..\packages\bin"
 				SubSystem="2"
 				SubSystem="2"

+ 2 - 2
Samples/tutorial/tutorial_drag/Drag.vcproj

@@ -55,7 +55,7 @@
 			/>
 			/>
 			<Tool
 			<Tool
 				Name="VCLinkerTool"
 				Name="VCLinkerTool"
-				AdditionalDependencies="EMPCore_d.lib RocketCore_d.lib RocketControls_d.lib RocketDebugger_d.lib libpng_d.lib zlib_d.lib opengl32.lib"
+				AdditionalDependencies="RocketCore_d.lib RocketControls_d.lib RocketDebugger_d.lib libpng_d.lib zlib_d.lib opengl32.lib"
 				OutputFile="..\..\..\..\..\packages\bin\$(ProjectName)_d.exe"
 				OutputFile="..\..\..\..\..\packages\bin\$(ProjectName)_d.exe"
 				AdditionalLibraryDirectories="..\..\shell\libpng;..\..\..\..\..\packages\bin"
 				AdditionalLibraryDirectories="..\..\shell\libpng;..\..\..\..\..\packages\bin"
 				GenerateDebugInformation="true"
 				GenerateDebugInformation="true"
@@ -124,7 +124,7 @@
 			/>
 			/>
 			<Tool
 			<Tool
 				Name="VCLinkerTool"
 				Name="VCLinkerTool"
-				AdditionalDependencies="EMPCore.lib RocketCore.lib RocketControls.lib RocketDebugger.lib libpng.lib zlib.lib opengl32.lib"
+				AdditionalDependencies="RocketCore.lib RocketControls.lib RocketDebugger.lib libpng.lib zlib.lib opengl32.lib"
 				OutputFile="..\..\..\..\..\packages\bin\$(ProjectName).exe"
 				OutputFile="..\..\..\..\..\packages\bin\$(ProjectName).exe"
 				AdditionalLibraryDirectories="..\..\shell\libpng;..\..\..\..\..\packages\bin"
 				AdditionalLibraryDirectories="..\..\shell\libpng;..\..\..\..\..\packages\bin"
 				SubSystem="2"
 				SubSystem="2"

+ 0 - 1
Samples/tutorial/tutorial_drag/SConstruct

@@ -18,7 +18,6 @@ INCLUDE = Split( """
 LIBS = Split( """
 LIBS = Split( """
 	RocketDebugger
 	RocketDebugger
 	RocketCore
 	RocketCore
-	EMPCore
 	Shell
 	Shell
 	""" )
 	""" )