Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion info/configure.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
files to. If <directory> does not contain a Project.xml file,
the tool recursively scans subdirectories and adds IDE templates
to all projects it finds (handy for flixel-demos for instance).
-ide <subl|fd|idea|vscode|none> : The IDE to use (overrides your setup).
-ide <subl|idea|vscode|none> : The IDE to use (overrides your setup).
For VSCode, a .code-workspace file is
generated if there's more than one project.
2 changes: 1 addition & 1 deletion info/create.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
or a number representing the number of the demo to create.
-dir <dir> : The directory in which to (recursively) look for projects.
Optional, defaults to the flixel-demos haxelib.
-ide <subl|fd|idea|vscode|none> : The IDE to use (overrides the configuration).
-ide <subl|idea|vscode|none> : The IDE to use (overrides the configuration).
2 changes: 1 addition & 1 deletion info/template.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
template's template.json. The default template has options
such as -n for project name and -w -h for width and height.
Eg. flixel tpl -n "Name" -w 680 -h 480
-ide <subl|fd|idea|vscode|none> : The IDE to use (overrides the configuration).
-ide <subl|idea|vscode|none> : The IDE to use (overrides the configuration).
Binary file modified run.n
Binary file not shown.
1 change: 0 additions & 1 deletion src/FlxTools.hx
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ class FlxTools extends CommandLineRunner
enum abstract IDE(String) from String to String
{
final SUBLIME_TEXT = "Sublime Text";
final FLASH_DEVELOP = "FlashDevelop";
final INTELLIJ_IDEA = "IntelliJ IDEA";
final VISUAL_STUDIO_CODE = "Visual Studio Code";
final NONE = "None";
Expand Down
8 changes: 1 addition & 7 deletions src/commands/Setup.hx
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,7 @@ class Setup extends Command

function promptForSettings():FlxToolSettings
{
final ides = [
IDE.SUBLIME_TEXT,
IDE.FLASH_DEVELOP,
IDE.INTELLIJ_IDEA,
IDE.VISUAL_STUDIO_CODE,
IDE.NONE
];
final ides = [IDE.SUBLIME_TEXT, IDE.INTELLIJ_IDEA, IDE.VISUAL_STUDIO_CODE, IDE.NONE];
var ide = IDE.NONE;
var AuthorName = "";
var IDEAutoOpen = false;
Expand Down
5 changes: 1 addition & 4 deletions src/utils/CommandUtils.hx
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,6 @@ class CommandUtils
ideDataPath = combine(ideDataPath, "ide-data");

FlxTools.templateSourcePaths = [
IDE.FLASH_DEVELOP => combine(ideDataPath, "flash-develop"),
IDE.INTELLIJ_IDEA => combine(ideDataPath, "intellij-idea"),
IDE.SUBLIME_TEXT => combine(ideDataPath, "sublime-text"),
IDE.VISUAL_STUDIO_CODE => combine(ideDataPath, "visual-studio-code")
Expand Down Expand Up @@ -337,9 +336,7 @@ class CommandUtils
final settings:FlxToolSettings = Json.parse(jsonContent);

// backwards compatibility with settings from versions <= 1.0.5
if (settings.DefaultEditor == "Flash Develop")
settings.DefaultEditor = IDE.FLASH_DEVELOP;
else if (settings.DefaultEditor == "Intellij Idea")
if (settings.DefaultEditor == "Intellij Idea")
settings.DefaultEditor = IDE.INTELLIJ_IDEA;

return settings;
Expand Down
21 changes: 1 addition & 20 deletions src/utils/ProjectUtils.hx
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,7 @@ class ProjectUtils
addOption("IDEA_Flixel_Engine_Library", settings.IDEA_Flixel_Engine_Library);
addOption("IDEA_Flixel_Addons_Library", settings.IDEA_Flixel_Addons_Library);

case IDE.FLASH_DEVELOP:
addOption("WIDTH", 640);
addOption("HEIGHT", 480);

case _: // TODO: IDE.FLASH_DEVELOP_FDZ
case _:
}

if (templateSource != null)
Expand All @@ -137,7 +133,6 @@ class ProjectUtils
{
final options = [
"subl" => IDE.SUBLIME_TEXT,
"fd" => IDE.FLASH_DEVELOP,
"idea" => IDE.INTELLIJ_IDEA,
"vscode" => IDE.VISUAL_STUDIO_CODE,
"none" => IDE.NONE
Expand Down Expand Up @@ -174,7 +169,6 @@ class ProjectUtils
public static function openWithIDE(projectPath:String, projectName:String, ide:IDE):Bool
{
final ideHandlers:Map<String, (String, String) -> Bool> = [
IDE.FLASH_DEVELOP => openWithFlashDevelop,
IDE.SUBLIME_TEXT => openWithSublimeText,
IDE.INTELLIJ_IDEA => openWithIntelliJIDEA,
IDE.VISUAL_STUDIO_CODE => openWithVisualStudioCode
Expand All @@ -192,19 +186,6 @@ class ProjectUtils
return result;
}

public static function openWithFlashDevelop(projectPath:String, projectName:String):Bool
{
var projectFile = CommandUtils.combine(projectPath, projectName + ".hxproj");
projectFile = projectFile.replace("/", "\\");

if (FileSys.exists(projectFile))
{
runCommand("explorer", [projectFile]);
return true;
}
return false;
}

public static function openWithSublimeText(projectPath:String, projectName:String):Bool
{
final projectFile = CommandUtils.combine(projectPath, projectName + ".sublime-project");
Expand Down