Kaynağa Gözat

Fixed script compilation in 64-bit Mac polybuild, removed 'experimental' from compile scripts option checkbox

Ivan Safrin 12 yıl önce
ebeveyn
işleme
f2639bd997

+ 1 - 1
IDE/Contents/Source/ExportProjectWindow.cpp

@@ -67,7 +67,7 @@ ExportProjectWindow::ExportProjectWindow() : UIWindow(L"Publish Project", 400, 3
 	label->color.a = 1.0;	
 	label->setPosition(padding, 260);
 
-	compileCheckBox = new UICheckBox("Compile Scripts (experimental)", false);
+	compileCheckBox = new UICheckBox("Compile Scripts", false);
 	addChild(compileCheckBox);
 	compileCheckBox->setPosition(padding, 295);
 

+ 1 - 0
Tools/Contents/polybuild/CMakeLists.txt

@@ -24,6 +24,7 @@ IF(MSVC OR MINGW)
     TARGET_LINK_LIBRARIES(polybuild Polycore ${LUA_LIBRARIES} ${PHYSFS_LIBRARY} ${ZLIB_LIBRARIES})
 ELSEIF(APPLE)
     TARGET_LINK_LIBRARIES(polybuild Polycore ${LUA_LIBRARIES} ${PHYSFS_LIBRARY} ${ZLIB_LIBRARIES} "-framework IOKit" "-framework Cocoa")
+    SET( CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -pagezero_size 10000 -image_base 100000000" ) 
 ELSE(MSVC OR MINGW)
     TARGET_LINK_LIBRARIES(polybuild Polycore ${LUA_LIBRARIES} ${PHYSFS_LIBRARY} ${ZLIB_LIBRARIES} dl)
 ENDIF(MSVC OR MINGW)