From 9099d89a679dfc6eaccd3dc4c264981df52b1b45 Mon Sep 17 00:00:00 2001 From: underscorediscovery Date: Sat, 1 Feb 2014 05:45:51 -0330 Subject: [PATCH] Provisionally cleaning up older --macro calls from the build files. It seems keep is a macro in newer versions of haxe, and is the preferred way anyway. I can't manage to get the compiler to remove the Main file no matter what, so removing it provisionally. It causes FD and probably more to choke on the code complete step when it throws errors from the --macro option. This can be readded if keep is really needed, but it doesn't appear to be (or if it's using the incorrect keep syntax then that could be corrected). --- templates/android/hxml/debug.hxml | 2 -- templates/android/hxml/release.hxml | 2 -- templates/blackberry/hxml/debug.hxml | 2 -- templates/blackberry/hxml/release.hxml | 2 -- templates/cpp/hxml/debug.hxml | 1 - templates/cpp/hxml/release.hxml | 1 - templates/emscripten/hxml/debug.hxml | 2 -- templates/emscripten/hxml/release.hxml | 3 --- templates/iphone/PROJ/haxe/Build.hxml | 2 -- templates/neko/hxml/debug.hxml | 2 -- templates/neko/hxml/release.hxml | 2 -- templates/tizen/hxml/debug.hxml | 2 -- templates/tizen/hxml/release.hxml | 2 -- templates/webos/hxml/debug.hxml | 2 -- templates/webos/hxml/release.hxml | 2 -- 15 files changed, 29 deletions(-) diff --git a/templates/android/hxml/debug.hxml b/templates/android/hxml/debug.hxml index 056f93ce0..d8dc94f20 100644 --- a/templates/android/hxml/debug.hxml +++ b/templates/android/hxml/debug.hxml @@ -4,6 +4,4 @@ -D android -D android-9 -debug ---macro allowPackage("flash") ---macro keep("::APP_MAIN::") -D no-compilation \ No newline at end of file diff --git a/templates/android/hxml/release.hxml b/templates/android/hxml/release.hxml index 8547f4034..d13afb58b 100644 --- a/templates/android/hxml/release.hxml +++ b/templates/android/hxml/release.hxml @@ -1,8 +1,6 @@ -main ApplicationMain ::HAXE_FLAGS:: -cp ::BUILD_DIR::/android/haxe -cpp ::CPP_DIR:: ---macro allowPackage("flash") ---macro keep("::APP_MAIN::") -D android -D android-9 -D no-compilation diff --git a/templates/blackberry/hxml/debug.hxml b/templates/blackberry/hxml/debug.hxml index ff8d7b279..8b386d318 100644 --- a/templates/blackberry/hxml/debug.hxml +++ b/templates/blackberry/hxml/debug.hxml @@ -1,7 +1,5 @@ -main ApplicationMain ::HAXE_FLAGS:: -cp ::BUILD_DIR::/blackberry/cpp/haxe -cpp ::CPP_DIR:: ---macro allowPackage("flash") ---macro keep("::APP_MAIN::") -D blackberry -debug \ No newline at end of file diff --git a/templates/blackberry/hxml/release.hxml b/templates/blackberry/hxml/release.hxml index 6fcacdf83..d6c0ef183 100644 --- a/templates/blackberry/hxml/release.hxml +++ b/templates/blackberry/hxml/release.hxml @@ -1,6 +1,4 @@ -main ApplicationMain ::HAXE_FLAGS:: -cp ::BUILD_DIR::/blackberry/cpp/haxe -cpp ::CPP_DIR:: ---macro allowPackage("flash") ---macro keep("::APP_MAIN::") -D blackberry \ No newline at end of file diff --git a/templates/cpp/hxml/debug.hxml b/templates/cpp/hxml/debug.hxml index 315367570..443f14774 100644 --- a/templates/cpp/hxml/debug.hxml +++ b/templates/cpp/hxml/debug.hxml @@ -1,5 +1,4 @@ -main ApplicationMain ::HAXE_FLAGS:: -cpp ::CPP_DIR:: -cp ::BUILD_DIR::/cpp/haxe ---macro allowPackage("flash") -debug \ No newline at end of file diff --git a/templates/cpp/hxml/release.hxml b/templates/cpp/hxml/release.hxml index c37382f13..b306ec7be 100644 --- a/templates/cpp/hxml/release.hxml +++ b/templates/cpp/hxml/release.hxml @@ -1,4 +1,3 @@ -main ApplicationMain ::HAXE_FLAGS:: -cp ::BUILD_DIR::/cpp/haxe -cpp ::CPP_DIR:: ---macro allowPackage("flash") \ No newline at end of file diff --git a/templates/emscripten/hxml/debug.hxml b/templates/emscripten/hxml/debug.hxml index 243cd84f7..544f01d3b 100644 --- a/templates/emscripten/hxml/debug.hxml +++ b/templates/emscripten/hxml/debug.hxml @@ -1,8 +1,6 @@ -main ApplicationMain ::HAXE_FLAGS:: -cp ::BUILD_DIR::/emscripten/haxe -cpp ::CPP_DIR:: ---macro allowPackage("flash") ---macro keep("::APP_MAIN::") -lib openfl-native -D emscripten -D webgl diff --git a/templates/emscripten/hxml/release.hxml b/templates/emscripten/hxml/release.hxml index 92bf816b4..5025e35d8 100644 --- a/templates/emscripten/hxml/release.hxml +++ b/templates/emscripten/hxml/release.hxml @@ -1,8 +1,5 @@ -main ApplicationMain ::HAXE_FLAGS:: -cp ::BUILD_DIR::/emscripten/haxe -cpp ::CPP_DIR:: ---macro allowPackage("flash") ---macro keep("::APP_MAIN::") --lib openfl-native -D emscripten -D webgl \ No newline at end of file diff --git a/templates/iphone/PROJ/haxe/Build.hxml b/templates/iphone/PROJ/haxe/Build.hxml index fba07966a..a77f2dd6b 100644 --- a/templates/iphone/PROJ/haxe/Build.hxml +++ b/templates/iphone/PROJ/haxe/Build.hxml @@ -1,6 +1,4 @@ -main ApplicationMain ::HAXE_FLAGS:: -D iphone -D ios ---macro allowPackage("flash") ---macro keep("::APP_MAIN::") -D no-compilation \ No newline at end of file diff --git a/templates/neko/hxml/debug.hxml b/templates/neko/hxml/debug.hxml index faf6f21ac..00753e663 100644 --- a/templates/neko/hxml/debug.hxml +++ b/templates/neko/hxml/debug.hxml @@ -1,6 +1,4 @@ -main ApplicationMain ::HAXE_FLAGS:: -cp ::BUILD_DIR::/neko/haxe -neko ::NEKO_FILE:: ---macro allowPackage("flash") ---macro keep("::APP_MAIN::") -debug \ No newline at end of file diff --git a/templates/neko/hxml/release.hxml b/templates/neko/hxml/release.hxml index 9202486ed..32e74491d 100644 --- a/templates/neko/hxml/release.hxml +++ b/templates/neko/hxml/release.hxml @@ -1,5 +1,3 @@ -main ApplicationMain ::HAXE_FLAGS:: -cp ::BUILD_DIR::/neko/haxe -neko ::NEKO_FILE:: ---macro allowPackage("flash") ---macro keep("::APP_MAIN::") \ No newline at end of file diff --git a/templates/tizen/hxml/debug.hxml b/templates/tizen/hxml/debug.hxml index dd6181f0d..779a8f1ae 100644 --- a/templates/tizen/hxml/debug.hxml +++ b/templates/tizen/hxml/debug.hxml @@ -1,8 +1,6 @@ -main ApplicationMain ::HAXE_FLAGS:: -cp ::BUILD_DIR::/tizen/haxe -cpp ::CPP_DIR:: ---macro allowPackage("flash") ---macro keep("::APP_MAIN::") -D tizen -debug -D no-compilation \ No newline at end of file diff --git a/templates/tizen/hxml/release.hxml b/templates/tizen/hxml/release.hxml index 65e177b62..087308420 100644 --- a/templates/tizen/hxml/release.hxml +++ b/templates/tizen/hxml/release.hxml @@ -1,7 +1,5 @@ -main ApplicationMain ::HAXE_FLAGS:: -cp ::BUILD_DIR::/tizen/haxe -cpp ::CPP_DIR:: ---macro allowPackage("flash") ---macro keep("::APP_MAIN::") -D tizen -D no-compilation \ No newline at end of file diff --git a/templates/webos/hxml/debug.hxml b/templates/webos/hxml/debug.hxml index 65fbfeab8..6453e8742 100644 --- a/templates/webos/hxml/debug.hxml +++ b/templates/webos/hxml/debug.hxml @@ -1,8 +1,6 @@ -main ApplicationMain ::HAXE_FLAGS:: -cp ::BUILD_DIR::/webos/haxe -cpp ::CPP_DIR:: ---macro allowPackage("flash") ---macro keep("::APP_MAIN::") -D webos -D HXCPP_LOAD_DEBUG -D HXCPP_RTLD_LAZY diff --git a/templates/webos/hxml/release.hxml b/templates/webos/hxml/release.hxml index 2c3f0835d..352af0329 100644 --- a/templates/webos/hxml/release.hxml +++ b/templates/webos/hxml/release.hxml @@ -1,7 +1,5 @@ -main ApplicationMain ::HAXE_FLAGS:: -cp ::BUILD_DIR::/webos/haxe -cpp ::CPP_DIR:: ---macro allowPackage("flash") ---macro keep("::APP_MAIN::") -D webos -D HXCPP_RTLD_LAZY \ No newline at end of file