Forráskód Böngészése

Renamed variable linux because it is actually a macro in gnu++98

Fixes #167
This caused compilation to fail because linux is defined as 1 in the preprocessor for gnu++98,
which is the default when compiling with g++. This could also have been solved by
chaging the c++ dialect to c++98 or something newer.
bobbaluba 13 éve
szülő
commit
229fa27837

+ 1 - 1
IDE/Contents/Include/PolycodeProjectManager.h

@@ -48,7 +48,7 @@ class PolycodeProjectManager : public EventDispatcher {
 	
 	PolycodeProject *getProjectByProjectFile(String projectFile);
 	
-	void exportProject(PolycodeProject *project, String exportPath, bool macOS, bool windows, bool _linux);
+	void exportProject(PolycodeProject *project, String exportPath, bool macOS, bool windows, bool linux_);
 	
 	int removeProject(PolycodeProject *project);
 	

+ 2 - 2
IDE/Contents/Source/PolycodeProjectManager.cpp

@@ -137,7 +137,7 @@ void PolycodeProjectManager::createNewProject(String templateFolder, String proj
 	openProject(projectLocation+"/"+projectName+"/"+projectName+".polyproject");	
 }
 
-void PolycodeProjectManager::exportProject(PolycodeProject *project, String exportPath, bool macOS, bool windows, bool linux) {
+void PolycodeProjectManager::exportProject(PolycodeProject *project, String exportPath, bool macOS, bool windows, bool linux_) {
 
 	String polycodeBasePath = CoreServices::getInstance()->getCore()->getDefaultWorkingDirectory();
 
@@ -172,7 +172,7 @@ void PolycodeProjectManager::exportProject(PolycodeProject *project, String expo
 		CoreServices::getInstance()->getCore()->copyDiskItem(polyappPath, exportPath+"/Win/main.polyapp");
 	}
 
-	if(linux) {
+	if(linux_) {
 		PolycodeConsole::print("Exporting Linux version to "+exportPath+"/Linux \n");
 		CoreServices::getInstance()->getCore()->copyDiskItem(publishPath+"/Linux", exportPath+"/Linux");
 		CoreServices::getInstance()->getCore()->moveDiskItem(exportPath+"/Linux/StandalonePlayer", exportPath+"/Linux/"+project->getProjectName());