mirror/php-ifm
1
0
Fork 0
mirror of https://github.com/misterunknown/ifm.git synced 2025-08-15 04:23:58 +02:00
Code Issues Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
Marco Dickert
2017-07-18 13:51:23 +02:00
parent 9ca393da7c
commit 5c9bd19ed1
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
compiler.php
View File

@@ -14,7 +14,7 @@ $IFM_SRC_JS = "src/ifm.js";
$IFM_BUILD_STANDALONE = "ifm.php";
$IFM_BUILD_STANDALONE_COMPRESSED = "ifm.min.php";
$IFM_BUILD_LIB_PHP = "build/ifmlib.php";
$IFM_BUILD_LIB_PHP = "build/libifm.php";
/**
* Prepare main script
@@ -42,11 +42,11 @@ foreach( $IFM_SRC_PHPFILES as $file ) {
file_put_contents( $IFM_BUILD_STANDALONE, $main );
file_put_contents( $IFM_BUILD_STANDALONE, $phpincludes, FILE_APPEND );
file_put_contents( $IFM_BUILD_STANDALONE, '
/**
* start IFM
*/
$ifm = new IFM();
$ifm->run();
/**
* start IFM
*/
$ifm = new IFM();
$ifm->run();
', FILE_APPEND );
/**