2DPhysics,3DPhysics and UI are now statically compiled into the player, disabled dynamic modules for now, added a UI theme pack to the player

.gitignore

@@ -47,6 +47,10 @@ Player/Build/Mac OS X/Polycode Player.xcodeproj/project.xcworkspace/xcuserdata/i
 /Bindings/Contents/LUA/Source/*.cpp	
 /Bindings/Contents/LUA/Source
 
+/Modules/Bindings/2DPhysics/API/Physics2D.pak
+/Modules/Bindings/3DPhysics/API/Physics3D.pak
+/Modules/Bindings/UI/API/UI.pak
+
 /Modules/Bindings/2DPhysics/API/Physics2D/*.lua
 /Modules/Bindings/2DPhysics/API/Physics2D.lua
 /Modules/Bindings/2DPhysics/Include/*.h

Assets/UIThemes/default/theme.xml

@@ -0,0 +1,144 @@
+<?xml version="1.0"?>
+<PolyConfig>
+	<uiDefaultFontName>sans</uiDefaultFontName>
+	<uiTextInputFontName>sans</uiTextInputFontName>
+	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>
+	<uiDefaultFontSize>11</uiDefaultFontSize>
+	<uiTextInputFontSize>11</uiTextInputFontSize>
+	<uiTextInputFontSizeMultiline>13</uiTextInputFontSizeMultiline>	
+	<uiTreeArrowIconImage>UIThemes/default/arrowIcon.png</uiTreeArrowIconImage>
+	<uiTreeCellHeight>20</uiTreeCellHeight>
+	<uiTreeCellPadding>4</uiTreeCellPadding>
+	
+	<textBgSkin>UIThemes/default/textfield.png</textBgSkin>
+	<textBgSkinT>3</textBgSkinT>
+	<textBgSkinR>3</textBgSkinR>
+	<textBgSkinB>3</textBgSkinB>
+	<textBgSkinL>3</textBgSkinL>
+	<textBgSkinPadding>5</textBgSkinPadding>
+	<textEditLineSpacing>14</textEditLineSpacing>
+	
+	<uiTreeCellSkin>UIThemes/default/treeCellBg.png</uiTreeCellSkin>
+	<uiTreeCellSkinPadding>0</uiTreeCellSkinPadding>
+	<uiTreeCellSkinT>3</uiTreeCellSkinT>
+	<uiTreeCellSkinR>3</uiTreeCellSkinR>
+	<uiTreeCellSkinB>3</uiTreeCellSkinB>
+	<uiTreeCellSkinL>3</uiTreeCellSkinL>
+	
+	<uiTreeCellSelectorSkin>UIThemes/default/selector.png</uiTreeCellSelectorSkin>
+	<uiTreeCellSelectorSkinPadding>4</uiTreeCellSelectorSkinPadding>
+	<uiTreeCellSelectorSkinT>4</uiTreeCellSelectorSkinT>
+	<uiTreeCellSelectorSkinR>3</uiTreeCellSelectorSkinR>
+	<uiTreeCellSelectorSkinB>4</uiTreeCellSelectorSkinB>
+	<uiTreeCellSelectorSkinL>0</uiTreeCellSelectorSkinL>
+	
+	<uiTreeContainerSkin>UIThemes/default/treeBg.png</uiTreeContainerSkin>
+	<uiTreeContainerSkinPadding>0</uiTreeContainerSkinPadding>
+	<uiTreeContainerSkinT>2</uiTreeContainerSkinT>
+	<uiTreeContainerSkinR>2</uiTreeContainerSkinR>
+	<uiTreeContainerSkinB>2</uiTreeContainerSkinB>
+	<uiTreeContainerSkinL>2</uiTreeContainerSkinL>
+	
+	<uiScrollDefaultSize>19</uiScrollDefaultSize>	
+	<uiScrollPanePadding>0</uiScrollPanePadding>
+
+	<uiButtonSkin>UIThemes/default/button.png</uiButtonSkin>
+	<uiButtonFocusedSkin>UIThemes/default/buttonFocused.png</uiButtonFocusedSkin>
+	<uiButtonFontSize>11</uiButtonFontSize>	
+	<uiButtonLabelOffsetX>0</uiButtonLabelOffsetX>
+	<uiButtonLabelOffsetY>0</uiButtonLabelOffsetY>	
+	<uiButtonSkinT>4</uiButtonSkinT>
+	<uiButtonSkinR>4</uiButtonSkinR>
+	<uiButtonSkinB>4</uiButtonSkinB>
+	<uiButtonSkinL>4</uiButtonSkinL>
+
+	<uiWindowSkin>UIThemes/default/windowBg.png</uiWindowSkin>
+	<uiWindowSkinT>29</uiWindowSkinT>
+	<uiWindowSkinR>12</uiWindowSkinR>
+	<uiWindowSkinB>12</uiWindowSkinB>
+	<uiWindowSkinL>12</uiWindowSkinL>
+	<uiWindowSkinPadding>15</uiWindowSkinPadding>		
+	<uiWindowTitleFont>sans</uiWindowTitleFont>
+	<uiWindowTitleFontSize>12</uiWindowTitleFontSize>
+	<uiWindowTitleX>15</uiWindowTitleX>	
+	<uiWindowTitleY>7</uiWindowTitleY>		
+	<uiWindowCloseIcon>UIThemes/default/closeIcon.png</uiWindowCloseIcon>
+	<uiCloseIconX>11</uiCloseIconX>	
+	<uiCloseIconY>5</uiCloseIconY>		
+
+	<uiScrollBgSkin>UIThemes/default/scrollBg.png</uiScrollBgSkin>
+	<uiScrollBgSkinPadding>1</uiScrollBgSkinPadding>
+	<uiScrollBgSkinT>8</uiScrollBgSkinT>
+	<uiScrollBgSkinR>8</uiScrollBgSkinR>
+	<uiScrollBgSkinB>8</uiScrollBgSkinB>
+	<uiScrollBgSkinL>8</uiScrollBgSkinL>
+	
+	<uiScrollHandleSkin>UIThemes/default/scrollHandle.png</uiScrollHandleSkin>
+	<uiScrollHandleSkinT>6</uiScrollHandleSkinT>
+	<uiScrollHandleSkinR>6</uiScrollHandleSkinR>
+	<uiScrollHandleSkinB>6</uiScrollHandleSkinB>
+	<uiScrollHandleSkinL>6</uiScrollHandleSkinL>
+		
+	<uiScrollHandleMinSize>30</uiScrollHandleMinSize>	
+	<uiTreeContainerScrollBarOffset>27</uiTreeContainerScrollBarOffset>
+	
+	<uiCheckBoxFont>sans</uiCheckBoxFont>
+	<uiCheckBoxFontSize>11</uiCheckBoxFontSize>	
+	<uiCheckBoxCheckedImage>UIThemes/default/checkbox_checked.png</uiCheckBoxCheckedImage>
+	<uiCheckBoxUncheckedImage>UIThemes/default/checkbox_unchecked.png</uiCheckBoxUncheckedImage>
+	<uiCheckBoxLabelOffsetX>8</uiCheckBoxLabelOffsetX>
+	<uiCheckBoxLabelOffsetY>0</uiCheckBoxLabelOffsetY>
+		
+	<uiComboBoxFont>sans</uiComboBoxFont>
+	<uiComboBoxFontSize>11</uiComboBoxFontSize>
+	<uiComboBoxDropdownImage>combobox_drop.png</uiComboBoxDropdownImage>
+	<uiComboBoxBgImage>combobox_bg.png</uiComboBoxBgImage>
+	<uiComboBoxBgT>6</uiComboBoxBgT>
+	<uiComboBoxBgR>6</uiComboBoxBgR>
+	<uiComboBoxBgB>6</uiComboBoxBgB>
+	<uiComboBoxBgL>6</uiComboBoxBgL>				
+	<uiComboBoxTextOffsetX>7</uiComboBoxTextOffsetX>
+	<uiComboBoxTextOffsetY>0</uiComboBoxTextOffsetY>		
+
+
+	<uiMenuFont>sans</uiMenuFont>
+	<uiMenuFontSize>11</uiMenuFontSize>
+	<uiMenuTextOffsetX>7</uiMenuTextOffsetX>
+	<uiMenuTextOffsetY>0</uiMenuTextOffsetY>		
+	<uiMenuPaddingX>4</uiMenuPaddingX>
+	<uiMenuPaddingY>8</uiMenuPaddingY>
+	<uiMenuBgImage>UIThemes/default/menu_bg.png</uiMenuBgImage>	
+	<uiMenuBgT>8</uiMenuBgT>
+	<uiMenuBgR>8</uiMenuBgR>
+	<uiMenuBgB>13</uiMenuBgB>
+	<uiMenuBgL>8</uiMenuBgL>			
+	<uiMenuSelectorBgImage>UIThemes/default/menu_selector.png</uiMenuSelectorBgImage>	
+	<uiMenuSelectorBgT>3</uiMenuSelectorBgT>
+	<uiMenuSelectorBgR>3</uiMenuSelectorBgR>
+	<uiMenuSelectorBgB>3</uiMenuSelectorBgB>
+	<uiMenuSelectorBgL>3</uiMenuSelectorBgL>
+	
+
+	<uiColorBoxFrameImage>UIThemes/default/colorboxFrame.png</uiColorBoxFrameImage>
+	<uiColorBoxFrameImageT>7</uiColorBoxFrameImageT>
+	<uiColorBoxFrameImageR>7</uiColorBoxFrameImageR>
+	<uiColorBoxFrameImageB>7</uiColorBoxFrameImageB>
+	<uiColorBoxFrameImageL>7</uiColorBoxFrameImageL>					
+	<uiColorBoxBgImage>UIThemes/default/colorboxBg.png</uiColorBoxBgImage>
+	<uiColorBoxFrameInset>2</uiColorBoxFrameInset>
+
+	<uiColorPickerMainBg>UIThemes/default/colorPickerMainBg.png</uiColorPickerMainBg>
+	<uiColorPickerMainFrame>UIThemes/default/colorPickerMainFrame.png</uiColorPickerMainFrame>
+	<uiColorPickerHueFrame>UIThemes/default/colorPickerHue.png</uiColorPickerHueFrame>
+	<uiColorPickerHueSelector>UIThemes/default/colorPickerHueSelector.png</uiColorPickerHueSelector>
+	<uiColorPickerMainSelector>UIThemes/default/colorPickerTarget.png</uiColorPickerMainSelector>
+
+	<uiHSliderGrip>UIThemes/default/hsliderHandle.png</uiHSliderGrip>
+	<uiHSliderBg>UIThemes/default/hsliderBg.png</uiHSliderBg>
+	<uiHSliderBgHeight>6</uiHSliderBgHeight>
+	<uiHSliderBgT>2</uiHSliderBgT>
+	<uiHSliderBgR>4</uiHSliderBgR>
+	<uiHSliderBgB>2</uiHSliderBgB>
+	<uiHSliderBgL>4</uiHSliderBgL>
+
+</PolyConfig>

Bindings/Scripts/create_lua_library/create_lua_library.py

@@ -76,9 +76,10 @@ def createLUABindings(inputPath, prefix, mainInclude, libSmallName, libName, api
 	cppRegisterOut += "#include \"PolyCoreServices.h\"\n\n"
 	cppRegisterOut += "using namespace Polycode;\n\n"
 	cppRegisterOut += "int luaopen_%s(lua_State *L) {\n" % (prefix)
-	if prefix != "Polycode":
-		cppRegisterOut += "CoreServices *inst = (CoreServices*) *((void**)lua_touserdata(L, 1));\n"
-		cppRegisterOut += "CoreServices::setInstance(inst);\n"
+
+#	if prefix != "Polycode":
+#		cppRegisterOut += "CoreServices *inst = (CoreServices*) *((void**)lua_touserdata(L, 1));\n"
+#		cppRegisterOut += "CoreServices::setInstance(inst);\n"
 	cppRegisterOut += "\tstatic const struct luaL_reg %sLib [] = {" % (libSmallName)
 	
 	wrappersHeaderOut += "#pragma once\n\n"
@@ -790,6 +791,11 @@ def createLUABindings(inputPath, prefix, mainInclude, libSmallName, libName, api
 			for root, dirs, files in os.walk("."):
 				for filename in fnmatch.filter(files, pattern):
 					myzip.write(os.path.join(root, filename))
+	else:
+		with ZipFile("%s.pak" % (libName), 'w') as myzip:
+			for root, dirs, files in os.walk("."):
+				for filename in fnmatch.filter(files, pattern):
+					myzip.write(os.path.join(root, filename))
 
 if len(sys.argv) < 10:
 	print ("Usage:\n%s [input path] [prefix] [main include] [lib small name] [lib name] [api path] [api class-path] [include path] [source path] [inherit-in-module-file path (optional)]" % (sys.argv[0]))

IDE/Build/Mac OS X/Polycode.xcodeproj/project.pbxproj

@@ -408,7 +408,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cp -R \"$PROJECT_DIR/../../Contents/Resources\" \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH\"\ncp -R \"$PROJECT_DIR/../../../Release/Darwin/Standalone\" \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources\"\ncp -R \"$PROJECT_DIR/../../../Bindings/Contents/LUA/API/api.pak\" \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources\"";
+			shellScript = "cp -R \"$PROJECT_DIR/../../Contents/Resources\" \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH\"\ncp -R \"$PROJECT_DIR/../../../Release/Darwin/Standalone\" \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources\"\ncp -R \"$PROJECT_DIR/../../../Bindings/Contents/LUA/API/api.pak\" \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources\"\ncp -R \"$PROJECT_DIR/../../../Modules/Bindings/UI/API/UI.pak\" \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources\"\ncp -R \"$PROJECT_DIR/../../../Modules/Bindings/2DPhysics/API/Physics2D.pak\" \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources\"\ncp -R \"$PROJECT_DIR/../../../Modules/Bindings/3DPhysics/API/Physics3D.pak\" \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources\"\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

IDE/Contents/Source/PolycodeIDEApp.cpp

@@ -43,7 +43,10 @@ PolycodeIDEApp::PolycodeIDEApp(PolycodeView *view) : EventDispatcher() {
 
 
 	CoreServices::getInstance()->getResourceManager()->addArchive("api.pak");
-
+	CoreServices::getInstance()->getResourceManager()->addArchive("Physics2D.pak");
+	CoreServices::getInstance()->getResourceManager()->addArchive("Physics3D.pak");
+	CoreServices::getInstance()->getResourceManager()->addArchive("UI.pak");
+			
 	CoreServices::getInstance()->getConfig()->loadConfig("Polycode", "UIThemes/default/theme.xml");
 	CoreServices::getInstance()->getResourceManager()->addArchive("UIThemes/default/");
 	CoreServices::getInstance()->getResourceManager()->addArchive("Images/");	

IDE/Contents/Source/PolycodeProject.cpp

@@ -171,6 +171,7 @@ bool PolycodeProject::saveFile() {
 		configFile.root["modules"]->Clear();
 	}
 	
+	/*
 	for(int j=0; j < data.modules.size(); j++) {
 		if(!configFile.root["modules"]) {
 			configFile.root.addChild("modules");			
@@ -181,6 +182,7 @@ bool PolycodeProject::saveFile() {
 		CoreServices::getInstance()->getResourceManager()->addArchive("Standalone/Modules/"+data.modules[j]+"/API");
 		
 	}
+	*/
 	
 	if(configFile.root["fonts"]) {
 		configFile.root["fonts"]->Clear();

Modules/Bindings/2DPhysics/CMakeLists.txt

@@ -12,83 +12,23 @@ INCLUDE_DIRECTORIES(
 
 SET(polycode2DPhysics_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/Source/Physics2DLUA.cpp
-    ../../Contents/2DPhysics/Source/PolyPhysicsScreen.cpp
-    ../../Contents/2DPhysics/Source/PolyPhysicsScreenEntity.cpp
 )
 
 SET(polycode2DPhysics_HDRS
     ${CMAKE_CURRENT_SOURCE_DIR}/Include/Physics2DLUA.h
     ${CMAKE_CURRENT_SOURCE_DIR}/Include/Physics2DLUAWrappers.h
-    ../../Contents/2DPhysics/Include/Polycode2DPhysics.h
-    ../../Contents/2DPhysics/Include/PolyPhysicsScreenEntity.h
-    ../../Contents/2DPhysics/Include/PolyPhysicsScreen.h
 )
 
-ADD_LIBRARY(Physics2D SHARED ${polycode2DPhysics_SRCS} ${polycode2DPhysics_HDRS})
+ADD_LIBRARY(Physics2DLua ${polycode2DPhysics_SRCS} ${polycode2DPhysics_HDRS})
 
 SET_SOURCE_FILES_PROPERTIES(Source/Physics2DLUA.cpp PROPERTIES GENERATED 1)
 SET_SOURCE_FILES_PROPERTIES(Include/Physics2DLUAWrappers.h PROPERTIES GENERATED 1)
 SET_SOURCE_FILES_PROPERTIES(Include/Physics2DLUA.h PROPERTIES GENERATED 1)
-ADD_DEPENDENCIES(Physics2D PolycodeLuaGenerate)
+ADD_DEPENDENCIES(Physics2DLua PolycodeLuaGenerate)
 
 SET(CMAKE_DEBUG_POSTFIX "_d")
 
-SET_TARGET_PROPERTIES(Physics2D PROPERTIES PREFIX "")
-
-IF(APPLE)
-TARGET_LINK_LIBRARIES(Physics2D
-	Polycore
-	${LUA_LIBRARY}
-	${BOX2D_RELEASE_LIBRARY}
-	"-framework Cocoa"
-	"-framework IOKit"
-        ${OPENGL_LIBRARIES}
-        ${OPENAL_LIBRARY}
-	${ZLIB_LIBRARIES}
-        ${PNG_LIBRARIES}
-        ${FREETYPE_LIBRARIES}
-        ${PHYSFS_LIBRARY}
-        ${OGG_LIBRARIES}
-        ${VORBIS_LIBRARIES}
-        ${VORBISFILE_LIBRARIES}
-        ${EXTRA_LIBS})
-ELSEIF(MSVC OR MINGW)
-
-	SET(WIN_EXTRA_LIBS ${ZLIB_LIBRARIES} opengl32 glu32 winmm ws2_32)
-
-TARGET_LINK_LIBRARIES(Physics2D
-	Polycore
-	${LUA_LIBRARY}
-  optimized ${BOX2D_RELEASE_LIBRARY}
-  debug ${BOX2D_DEBUG_LIBRARY}
-        ${OPENGL_LIBRARIES}
-        ${OPENAL_LIBRARY}
-        ${PNG_LIBRARIES}
-        ${FREETYPE_LIBRARIES}
-        ${PHYSFS_LIBRARY}
-        ${OGG_LIBRARIES}
-        ${VORBIS_LIBRARIES}
-        ${VORBISFILE_LIBRARIES}
-        ${EXTRA_LIBS}
-        ${WIN_EXTRA_LIBS})
-
-ELSE(APPLE)
-
-TARGET_LINK_LIBRARIES(Physics2D
-	Polycore
-	${LUA_LIBRARY}
-        ${BOX2D_RELEASE_LIBRARY}
-        ${OPENGL_LIBRARIES}
-        ${OPENAL_LIBRARY}
-        ${PNG_LIBRARIES}
-        ${FREETYPE_LIBRARIES}
-        ${PHYSFS_LIBRARY}
-        ${OGG_LIBRARIES}
-        ${VORBIS_LIBRARIES}
-        ${VORBISFILE_LIBRARIES}
-        ${EXTRA_LIBS})
-          
-ENDIF(APPLE)
+SET_TARGET_PROPERTIES(Physics2DLua PROPERTIES PREFIX "")
 
 IF(POLYCODE_INSTALL_FRAMEWORK)
     
@@ -96,17 +36,7 @@ IF(POLYCODE_INSTALL_FRAMEWORK)
     INSTALL(FILES ${polycode2DPhysics_HDRS} 
         DESTINATION Bindings/Lua/Modules/2DPhysics/include)
 
-    INSTALL(DIRECTORY API DESTINATION Bindings/Lua/Modules/2DPhysics)
-	
-    # install libraries
-#    IF(POLYCODE_BUILD_SHARED)
-#        INSTALL(TARGETS PolycodeLua_dynamic
-#            DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/lib)
-#    ENDIF(POLYCODE_BUILD_SHARED)
-    
-#    IF(POLYCODE_BUILD_STATIC)
-     INSTALL(TARGETS Physics2D
-         DESTINATION Bindings/Lua/Modules/2DPhysics/lib)
-#    ENDIF(POLYCODE_BUILD_STATIC)
+	INSTALL(DIRECTORY API DESTINATION Bindings/Lua/Modules/2DPhysics)
+	INSTALL(TARGETS Physics2DLua DESTINATION Bindings/Lua/Modules/2DPhysics/lib)
     
 ENDIF(POLYCODE_INSTALL_FRAMEWORK)

Modules/Bindings/3DPhysics/CMakeLists.txt

@@ -13,97 +13,23 @@ INCLUDE_DIRECTORIES(
 
 SET(polycode3DPhysics_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/Source/Physics3DLUA.cpp
-    ../../Contents/3DPhysics/Source/PolyPhysicsSceneEntity.cpp
-    ../../Contents/3DPhysics/Source/PolyPhysicsScene.cpp
-    ../../Contents/3DPhysics/Source/PolyCollisionSceneEntity.cpp
-    ../../Contents/3DPhysics/Source/PolyCollisionScene.cpp
 )
 
 SET(polycode3DPhysics_HDRS
     ${CMAKE_CURRENT_SOURCE_DIR}/Include/Physics3DLUA.h
     ${CMAKE_CURRENT_SOURCE_DIR}/Include/Physics3DLUAWrappers.h
-    ../../Contents/3DPhysics/Include/PolyPhysicsSceneEntity.h
-    ../../Contents/3DPhysics/Include/Polycode3DPhysics.h
-    ../../Contents/3DPhysics/Include/PolyCollisionScene.h
-    ../../Contents/3DPhysics/Include/PolyPhysicsScene.h
-    ../../Contents/3DPhysics/Include/PolyCollisionSceneEntity.h
 )
 
-ADD_LIBRARY(Physics3D SHARED ${polycode3DPhysics_SRCS} ${polycode3DPhysics_HDRS})
+ADD_LIBRARY(Physics3DLua  ${polycode3DPhysics_SRCS} ${polycode3DPhysics_HDRS})
 
 SET_SOURCE_FILES_PROPERTIES(Source/Physics3DLUA.cpp PROPERTIES GENERATED 1)
 SET_SOURCE_FILES_PROPERTIES(Include/Physics3DLUAWrappers.h PROPERTIES GENERATED 1)
 SET_SOURCE_FILES_PROPERTIES(Include/Physics3DLUA.h PROPERTIES GENERATED 1)
-ADD_DEPENDENCIES(Physics3D PolycodeLuaGenerate)
+ADD_DEPENDENCIES(Physics3DLua PolycodeLuaGenerate)
 
 SET(CMAKE_DEBUG_POSTFIX "_d")
 
-SET_TARGET_PROPERTIES(Physics3D PROPERTIES PREFIX "")
-
-IF(APPLE)
-TARGET_LINK_LIBRARIES(Physics3D
-	Polycore
-	${LUA_LIBRARY}
-	${BULLET_LIBRARIES}
-	"-framework Cocoa"
-	"-framework IOKit"
-        ${OPENGL_LIBRARIES}
-        ${OPENAL_LIBRARY}
-	${ZLIB_LIBRARIES}
-        ${PNG_LIBRARIES}
-        ${FREETYPE_LIBRARIES}
-        ${PHYSFS_LIBRARY}
-        ${OGG_LIBRARIES}
-        ${VORBIS_LIBRARIES}
-        ${VORBISFILE_LIBRARIES}
-        ${EXTRA_LIBS})
-
-ELSEIF(MSVC OR MINGW)
-	SET(WIN_EXTRA_LIBS ${ZLIB_LIBRARIES} opengl32 glu32 winmm ws2_32)
-
-TARGET_LINK_LIBRARIES(Physics3D
-	Polycore
-	${LUA_LIBRARY}
-        optimized ${LIBBULLETMULTITHREADED}
-        optimized ${LIBBULLETSOFTBODY} 
-        optimized ${LIBBULLETDYNAMICS} 
-        optimized ${LIBBULLETCOLLISION}
-        optimized ${LIBBULLETMATH}            
-        debug ${LIBBULLETMULTITHREADED_DEBUG}
-        debug ${LIBBULLETSOFTBODY_DEBUG} 
-        debug ${LIBBULLETDYNAMICS_DEBUG} 
-        debug ${LIBBULLETCOLLISION_DEBUG}
-        debug ${LIBBULLETMATH_DEBUG}            
-        ${OPENGL_LIBRARIES}
-        ${OPENAL_LIBRARY}
-        ${PNG_LIBRARIES}
-        ${FREETYPE_LIBRARIES}
-        ${PHYSFS_LIBRARY}
-        ${OGG_LIBRARIES}
-        ${VORBIS_LIBRARIES}
-        ${VORBISFILE_LIBRARIES}
-        ${EXTRA_LIBS}
-        ${WIN_EXTRA_LIBS})
-
-ELSE(APPLE)
-
-TARGET_LINK_LIBRARIES(Physics3D
-	Polycore
-	${LUA_LIBRARY}	
-  ${BULLET_LIBRARIES}
-        ${OPENGL_LIBRARIES}
-        ${OPENAL_LIBRARY}
-        ${PNG_LIBRARIES}
-        ${FREETYPE_LIBRARIES}
-        ${PHYSFS_LIBRARY}
-        ${OGG_LIBRARIES}
-        ${VORBIS_LIBRARIES}
-        ${VORBISFILE_LIBRARIES}
-        ${EXTRA_LIBS})
-        
-        
-ENDIF(APPLE)
-
+SET_TARGET_PROPERTIES(Physics3DLua PROPERTIES PREFIX "")
 
 IF(POLYCODE_INSTALL_FRAMEWORK)
     
@@ -112,16 +38,6 @@ IF(POLYCODE_INSTALL_FRAMEWORK)
         DESTINATION Bindings/Lua/Modules/3DPhysics/include)
 
     INSTALL(DIRECTORY API DESTINATION Bindings/Lua/Modules/3DPhysics)
-	
-    # install libraries
-#    IF(POLYCODE_BUILD_SHARED)
-#        INSTALL(TARGETS PolycodeLua_dynamic
-#            DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/lib)
-#    ENDIF(POLYCODE_BUILD_SHARED)
-    
-#    IF(POLYCODE_BUILD_STATIC)
-     INSTALL(TARGETS Physics3D
-         DESTINATION Bindings/Lua/Modules/3DPhysics/lib)
-#    ENDIF(POLYCODE_BUILD_STATIC)
+    INSTALL(TARGETS Physics3DLua DESTINATION Bindings/Lua/Modules/3DPhysics/lib)
     
 ENDIF(POLYCODE_INSTALL_FRAMEWORK)

Modules/Bindings/UI/CMakeLists.txt

@@ -9,135 +9,31 @@ INCLUDE_DIRECTORIES(
 
 SET(polycodeUI_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/Source/UILUA.cpp
-    ../../Contents/UI/Source/PolyUIBox.cpp
-    ../../Contents/UI/Source/PolyUIButton.cpp
-    ../../Contents/UI/Source/PolyUICheckBox.cpp
-    ../../Contents/UI/Source/PolyUIColorBox.cpp
-    ../../Contents/UI/Source/PolyUIComboBox.cpp
-    ../../Contents/UI/Source/PolyUIElement.cpp
-    ../../Contents/UI/Source/PolyUIEvent.cpp
-    ../../Contents/UI/Source/PolyUIHScrollBar.cpp
-    ../../Contents/UI/Source/PolyUIHSizer.cpp
-    ../../Contents/UI/Source/PolyUIHSlider.cpp
-    ../../Contents/UI/Source/PolyUIImageButton.cpp
-    ../../Contents/UI/Source/PolyUIScrollContainer.cpp
-    ../../Contents/UI/Source/PolyUITextInput.cpp
-    ../../Contents/UI/Source/PolyUITree.cpp
-    ../../Contents/UI/Source/PolyUITreeContainer.cpp
-    ../../Contents/UI/Source/PolyUITreeEvent.cpp
-    ../../Contents/UI/Source/PolyUIVScrollBar.cpp
-    ../../Contents/UI/Source/PolyUIVSizer.cpp
-    ../../Contents/UI/Source/PolyUIWindow.cpp
-    ../../Contents/UI/Source/PolyUIMenu.cpp
 )
 
 SET(polycodeUI_HDRS
     ${CMAKE_CURRENT_SOURCE_DIR}/Include/UILUA.h
     ${CMAKE_CURRENT_SOURCE_DIR}/Include/UILUAWrappers.h
-    ../../Contents/UI/Include/PolyUIBox.h
-    ../../Contents/UI/Include/PolyUIButton.h
-    ../../Contents/UI/Include/PolyUICheckBox.h
-    ../../Contents/UI/Include/PolyUIColorBox.h
-    ../../Contents/UI/Include/PolyUIComboBox.h
-    ../../Contents/UI/Include/PolyUIElement.h
-    ../../Contents/UI/Include/PolyUIEvent.h
-    ../../Contents/UI/Include/PolyUIHScrollBar.h
-    ../../Contents/UI/Include/PolyUIHSizer.h
-    ../../Contents/UI/Include/PolyUIHSlider.h
-    ../../Contents/UI/Include/PolyUIImageButton.h
-    ../../Contents/UI/Include/PolyUIScrollContainer.h
-    ../../Contents/UI/Include/PolyUITextInput.h
-    ../../Contents/UI/Include/PolyUITree.h
-    ../../Contents/UI/Include/PolyUITreeContainer.h
-    ../../Contents/UI/Include/PolyUITreeEvent.h
-    ../../Contents/UI/Include/PolyUIVScrollBar.h
-    ../../Contents/UI/Include/PolyUIVSizer.h
-    ../../Contents/UI/Include/PolyUIWindow.h
-    ../../Contents/UI/Include/PolyUIMenu.h
-    ../../Contents/UI/Include/PolycodeUI.h
 )
 
-ADD_LIBRARY(UI SHARED ${polycodeUI_SRCS} ${polycodeUI_HDRS})
+ADD_LIBRARY(UILua ${polycodeUI_SRCS} ${polycodeUI_HDRS})
 
 SET_SOURCE_FILES_PROPERTIES(Source/UILUA.cpp PROPERTIES GENERATED 1)
 SET_SOURCE_FILES_PROPERTIES(Include/UILUAWrappers.h PROPERTIES GENERATED 1)
 SET_SOURCE_FILES_PROPERTIES(Include/UILUA.h PROPERTIES GENERATED 1)
-ADD_DEPENDENCIES(UI PolycodeLuaGenerate)
+ADD_DEPENDENCIES(UILua PolycodeLuaGenerate)
 
 SET(CMAKE_DEBUG_POSTFIX "_d")
 
-SET_TARGET_PROPERTIES(UI PROPERTIES PREFIX "")
-
-IF(APPLE)
-TARGET_LINK_LIBRARIES(UI
-	Polycore
-	${LUA_LIBRARY}
-	"-framework Cocoa"
-	"-framework IOKit"
-        ${OPENGL_LIBRARIES}
-        ${OPENAL_LIBRARY}
-		${ZLIB_LIBRARIES}
-        ${PNG_LIBRARIES}
-        ${ZLIB_LIBRARIES}
-        ${FREETYPE_LIBRARIES}
-        ${PHYSFS_LIBRARY}
-        ${OGG_LIBRARIES}
-        ${VORBIS_LIBRARIES}
-        ${VORBISFILE_LIBRARIES}
-        ${EXTRA_LIBS})
-ELSEIF(MSVC OR MINGW)
-
-	SET(WIN_EXTRA_LIBS ${ZLIB_LIBRARIES} opengl32 glu32 winmm ws2_32)
-
-TARGET_LINK_LIBRARIES(UI
-	Polycore
-	${LUA_LIBRARY}
-        ${OPENGL_LIBRARIES}
-        ${OPENAL_LIBRARY}
-        ${PNG_LIBRARIES}
-        ${ZLIB_LIBRARIES}
-        ${FREETYPE_LIBRARIES}
-        ${PHYSFS_LIBRARY}
-        ${OGG_LIBRARIES}
-        ${VORBIS_LIBRARIES}
-        ${VORBISFILE_LIBRARIES}
-        ${EXTRA_LIBS}
-        ${WIN_EXTRA_LIBS})
-
-ELSE(APPLE)
-
-TARGET_LINK_LIBRARIES(UI
-	Polycore
-	${LUA_LIBRARY}
-        ${OPENGL_LIBRARIES}
-        ${OPENAL_LIBRARY}
-        ${PNG_LIBRARIES}
-        ${FREETYPE_LIBRARIES}
-        ${PHYSFS_LIBRARY}
-        ${OGG_LIBRARIES}
-        ${VORBIS_LIBRARIES}
-        ${VORBISFILE_LIBRARIES}
-        ${EXTRA_LIBS})
-          
-ENDIF(APPLE)
+SET_TARGET_PROPERTIES(UILua PROPERTIES PREFIX "")
 
 IF(POLYCODE_INSTALL_FRAMEWORK)
     
     # install headers
-    INSTALL(FILES ${polycodeUI_HDRS} 
-        DESTINATION Bindings/Lua/Modules/UI/include)
+    INSTALL(FILES ${polycodeUI_HDRS} DESTINATION Bindings/Lua/Modules/UI/include)
 
     INSTALL(DIRECTORY API DESTINATION Bindings/Lua/Modules/UI)
-	
-    # install libraries
-#    IF(POLYCODE_BUILD_SHARED)
-#        INSTALL(TARGETS PolycodeLua_dynamic
-#            DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/lib)
-#    ENDIF(POLYCODE_BUILD_SHARED)
-    
-#    IF(POLYCODE_BUILD_STATIC)
-     INSTALL(TARGETS UI
-         DESTINATION Bindings/Lua/Modules/UI/lib)
-#    ENDIF(POLYCODE_BUILD_STATIC)
+    INSTALL(TARGETS UILua DESTINATION Bindings/Lua/Modules/UI/lib)
     
 ENDIF(POLYCODE_INSTALL_FRAMEWORK)
+

Player/Contents/CMakeLists.txt

@@ -7,6 +7,9 @@ IF(MSVC OR MINGW)
 INCLUDE_DIRECTORIES(
     ${LUA_INCLUDE_DIR}
     ${Polycode_SOURCE_DIR}/Bindings/Contents/LUA/Include
+    ${Polycode_SOURCE_DIR}/Modules/Bindings/UI/Include
+    ${Polycode_SOURCE_DIR}/Modules/Bindings/2DPhysics/Include
+    ${Polycode_SOURCE_DIR}/Modules/Bindings/3DPhysics/Include
     Include
     ../../Core/Contents/PolycodeView/MSVC/
 )
@@ -86,6 +89,17 @@ SET( CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -pagezero_size 10000 -im
 INCLUDE_DIRECTORIES(
     ${LUA_INCLUDE_DIR}
     ${Polycode_SOURCE_DIR}/Bindings/Contents/LUA/Include
+ 
+    ${Polycode_SOURCE_DIR}/Modules/Contents/UI/Include
+    ${Polycode_SOURCE_DIR}/Modules/Bindings/UI/Include
+
+    ${BOX2D_INCLUDE_DIR}
+    ${Polycode_SOURCE_DIR}/Modules/Contents/2DPhysics/Include
+    ${Polycode_SOURCE_DIR}/Modules/Bindings/2DPhysics/Include
+
+    ${BULLET_INCLUDE_DIR}
+    ${Polycode_SOURCE_DIR}/Modules/Contents/3DPhysics/Include
+    ${Polycode_SOURCE_DIR}/Modules/Bindings/3DPhysics/Include
     Include
     ../../Core/Contents/PolycodeView/Mac\ OS\ X/
 )
@@ -120,7 +134,6 @@ INCLUDE_DIRECTORIES(
 	../../Core/Contents/PolycodeView/Mac\ OS\ X/PolycodeView.h
     )
   
-    INCLUDE_DIRECTORIES(Include)
     
 #    IF(POLYCODE_BUILD_SHARED)
 #        ADD_EXECUTABLE(PolycodePlayer MACOSX_BUNDLE ${polycodeplayer_SRCS} ${polycodeplayer_HDRS})
@@ -164,6 +177,25 @@ endif()
         ${OGG_LIBRARY}
         ${VORBIS_LIBRARY}
         ${VORBISFILE_LIBRARY}
+	
+	${BOX2D_RELEASE_LIBRARY}
+        optimized ${LIBBULLETMULTITHREADED}
+        optimized ${LIBBULLETSOFTBODY} 
+        optimized ${LIBBULLETDYNAMICS} 
+        optimized ${LIBBULLETCOLLISION}
+        optimized ${LIBBULLETMATH}            
+        debug ${LIBBULLETMULTITHREADED_DEBUG}
+        debug ${LIBBULLETSOFTBODY_DEBUG} 
+        debug ${LIBBULLETDYNAMICS_DEBUG} 
+        debug ${LIBBULLETCOLLISION_DEBUG}
+        debug ${LIBBULLETMATH_DEBUG}  
+	Polycode2DPhysics
+	Polycode3DPhysics
+	PolycodeUI
+	Physics2DLua
+	Physics3DLua
+	UILua
+	
      )
 
     TARGET_LINK_LIBRARIES(StandalonePlayer 
@@ -181,6 +213,24 @@ endif()
         ${OGG_LIBRARY}
         ${VORBIS_LIBRARY}
         ${VORBISFILE_LIBRARY}
+	
+	${BOX2D_RELEASE_LIBRARY}
+        optimized ${LIBBULLETMULTITHREADED}
+        optimized ${LIBBULLETSOFTBODY} 
+        optimized ${LIBBULLETDYNAMICS} 
+        optimized ${LIBBULLETCOLLISION}
+        optimized ${LIBBULLETMATH}            
+        debug ${LIBBULLETMULTITHREADED_DEBUG}
+        debug ${LIBBULLETSOFTBODY_DEBUG} 
+        debug ${LIBBULLETDYNAMICS_DEBUG} 
+        debug ${LIBBULLETCOLLISION_DEBUG}
+        debug ${LIBBULLETMATH_DEBUG}  
+	Polycode2DPhysics
+	Polycode3DPhysics
+	PolycodeUI
+	Physics2DLua
+	Physics3DLua
+	UILua
      )
 
 	add_custom_command (TARGET PolycodePlayer PRE_BUILD
@@ -193,6 +243,14 @@ endif()
                       COMMAND cp ${Polycode_SOURCE_DIR}/Assets/Default\ asset\ pack/default.pak ${PROJECT_BINARY_DIR}/Player/Contents/\${CONFIGURATION}/PolycodePlayer.app/Contents/Resources)
 	add_custom_command (TARGET PolycodePlayer PRE_BUILD
                       COMMAND cp -R ${Polycode_SOURCE_DIR}/Bindings/Contents/LUA/API/api.pak ${PROJECT_BINARY_DIR}/Player/Contents/\${CONFIGURATION}/PolycodePlayer.app/Contents/Resources)
+	add_custom_command (TARGET PolycodePlayer PRE_BUILD
+                      COMMAND cp -R ${Polycode_SOURCE_DIR}/Modules/Bindings/2DPhysics/API/Physics2D.pak ${PROJECT_BINARY_DIR}/Player/Contents/\${CONFIGURATION}/PolycodePlayer.app/Contents/Resources)
+	add_custom_command (TARGET PolycodePlayer PRE_BUILD
+                      COMMAND cp -R ${Polycode_SOURCE_DIR}/Modules/Bindings/3DPhysics/API/Physics3D.pak ${PROJECT_BINARY_DIR}/Player/Contents/\${CONFIGURATION}/PolycodePlayer.app/Contents/Resources)
+	add_custom_command (TARGET PolycodePlayer PRE_BUILD
+                      COMMAND cp -R ${Polycode_SOURCE_DIR}/Modules/Bindings/UI/API/UI.pak ${PROJECT_BINARY_DIR}/Player/Contents/\${CONFIGURATION}/PolycodePlayer.app/Contents/Resources)
+	add_custom_command (TARGET PolycodePlayer PRE_BUILD
+                      COMMAND cp -R ${Polycode_SOURCE_DIR}/Assets/UIThemes.pak ${PROJECT_BINARY_DIR}/Player/Contents/\${CONFIGURATION}/PolycodePlayer.app/Contents/Resources)
 
 	add_custom_command (TARGET StandalonePlayer PRE_BUILD
                       COMMAND mkdir -p ${PROJECT_BINARY_DIR}/Player/Contents/\${CONFIGURATION}/StandalonePlayer.app/Contents/Resources)
@@ -204,6 +262,14 @@ endif()
                       COMMAND cp -R ${Polycode_SOURCE_DIR}/Bindings/Contents/LUA/API/api.pak ${PROJECT_BINARY_DIR}/Player/Contents/\${CONFIGURATION}/StandalonePlayer.app/Contents/Resources)
 	add_custom_command (TARGET StandalonePlayer PRE_BUILD
                       COMMAND cp ${Polycode_SOURCE_DIR}/Assets/SamplePolyapp/main.polyapp ${PROJECT_BINARY_DIR}/Player/Contents/\${CONFIGURATION}/StandalonePlayer.app/Contents/Resources)
+	add_custom_command (TARGET StandalonePlayer PRE_BUILD
+                      COMMAND cp -R ${Polycode_SOURCE_DIR}/Modules/Bindings/2DPhysics/API/Physics2D.pak ${PROJECT_BINARY_DIR}/Player/Contents/\${CONFIGURATION}/StandalonePlayer.app/Contents/Resources)
+	add_custom_command (TARGET StandalonePlayer PRE_BUILD
+                      COMMAND cp -R ${Polycode_SOURCE_DIR}/Modules/Bindings/3DPhysics/API/Physics3D.pak ${PROJECT_BINARY_DIR}/Player/Contents/\${CONFIGURATION}/StandalonePlayer.app/Contents/Resources)
+	add_custom_command (TARGET StandalonePlayer PRE_BUILD
+                      COMMAND cp -R ${Polycode_SOURCE_DIR}/Modules/Bindings/UI/API/UI.pak ${PROJECT_BINARY_DIR}/Player/Contents/\${CONFIGURATION}/StandalonePlayer.app/Contents/Resources)
+	add_custom_command (TARGET StandalonePlayer PRE_BUILD
+                      COMMAND cp -R ${Polycode_SOURCE_DIR}/Assets/UIThemes.pak ${PROJECT_BINARY_DIR}/Player/Contents/\${CONFIGURATION}/PolycodePlayer.app/Contents/Resources)
 
 
 foreach(xib ${PolycodePlayer_XIBS})

Player/Contents/Include/PolycodePlayer.h

@@ -27,6 +27,9 @@ THE SOFTWARE.
 
 #include "Polycode.h"
 #include "PolycodeLUA.h"
+#include "UILUA.h"
+#include "Physics2DLUA.h"
+#include "Physics3DLUA.h"
 #include "PolyGLSLShaderModule.h"
 #include "OSBasics.h"
 

Player/Contents/Source/PolycodePlayer.cpp

@@ -322,7 +322,7 @@ static void dumpstack (lua_State *L) {
 		luaL_openlibs(L);		
 		luaopen_debug(L);		
 		luaopen_Polycode(L);
-
+				
 		lua_getfield(L, LUA_GLOBALSINDEX, "package");	// push "package"
 		lua_getfield(L, -1, "loaders");					// push "package.loaders"
 		lua_remove(L, -2);								// remove "package"
@@ -357,11 +357,29 @@ static void dumpstack (lua_State *L) {
 		lua_getfield(L, LUA_GLOBALSINDEX, "require");
 		lua_pushstring(L, "Polycode");		
 		lua_call(L, 1, 0);		
+
+		lua_getfield(L, LUA_GLOBALSINDEX, "require");
+		lua_pushstring(L, "Physics2D");		
+		lua_call(L, 1, 0);		
+
+		lua_getfield(L, LUA_GLOBALSINDEX, "require");
+		lua_pushstring(L, "Physics3D");		
+		lua_call(L, 1, 0);		
+
+		lua_getfield(L, LUA_GLOBALSINDEX, "require");
+		lua_pushstring(L, "UI");		
+		lua_call(L, 1, 0);		
 		
 		lua_getfield(L, LUA_GLOBALSINDEX, "require");
 		lua_pushstring(L, "defaults");		
 		lua_call(L, 1, 0);
+		
+		luaopen_Physics2D(L);
+		luaopen_Physics3D(L);
+		luaopen_UI(L);
+		
 				
+		/*		
 		for(int i=0; i < loadedModules.size(); i++) {
 			String moduleName = loadedModules[i];
 #ifdef _WINDOWS
@@ -407,7 +425,7 @@ static void dumpstack (lua_State *L) {
 			//f(Polycore.CoreServices_getInstance())
 					
 		}
-
+*/
 		String fileData = "";
 
 		OSFILE *inFile = OSBasics::open(fileName, "r");	
@@ -645,9 +663,14 @@ void PolycodePlayer::loadFile(const char *fileName) {
 	}
 	
 	Logger::log("Core created...\n");
+
+	CoreServices::getInstance()->getResourceManager()->addArchive("UIThemes.pak");
+	CoreServices::getInstance()->getConfig()->loadConfig("Polycode", "UIThemes/default/theme.xml");
 	
 	CoreServices::getInstance()->getResourceManager()->addArchive("api.pak");
-	
+	CoreServices::getInstance()->getResourceManager()->addArchive("Physics2D.pak");
+	CoreServices::getInstance()->getResourceManager()->addArchive("Physics3D.pak");
+	CoreServices::getInstance()->getResourceManager()->addArchive("UI.pak");			
 	if(configFile.root["packedItems"]) {
 		ObjectEntry *packed = configFile.root["packedItems"];
 		if(packed) {

Standalone/CMakeLists.txt

@@ -8,9 +8,6 @@ SET(CMAKE_INSTALL_PREFIX ${POLYCODE_RELEASE_DIR}/Standalone/)
 INSTALL(FILES ../LICENSE.txt
         DESTINATION ./)
 
-INSTALL(DIRECTORY ${PolycodeStandalone_SOURCE_DIR}/../Modules/Bindings/2DPhysics/API DESTINATION Modules/Physics2D)
-INSTALL(DIRECTORY ${PolycodeStandalone_SOURCE_DIR}/../Modules/Bindings/3DPhysics/API DESTINATION Modules/Physics3D)
-INSTALL(DIRECTORY ${PolycodeStandalone_SOURCE_DIR}/../Modules/Bindings/UI/API DESTINATION Modules/UI)
 
 INSTALL(DIRECTORY ${PolycodeStandalone_SOURCE_DIR}/../Examples/Lua DESTINATION Examples)
 
@@ -30,9 +27,6 @@ IF(MSVC OR MINGW)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/hdr.pak DESTINATION Publish/Win)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/api.pak DESTINATION Publish/Win)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/main.polyapp DESTINATION Publish/Win)
-	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Bindings/Lua/Modules/2DPhysics/lib/Physics2D.dll DESTINATION Modules/Physics2D/Lib/win)
-	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Bindings/Lua/Modules/3DPhysics/lib/Physics3D.dll DESTINATION Modules/Physics3D/Lib/win)
-	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Bindings/Lua/Modules/UI/lib/UI.dll DESTINATION Modules/UI/Lib/win)
 
 INSTALL(PROGRAMS ${POLYCODE_RELEASE_DIR}/Framework/Tools/polybuild.exe DESTINATION Bin)
 INSTALL(PROGRAMS ${POLYCODE_RELEASE_DIR}/Framework/Tools/polyimport.exe DESTINATION Bin)
@@ -43,9 +37,6 @@ ELSEIF(APPLE)
 
 	INSTALL(DIRECTORY ${POLYCODE_RELEASE_DIR}/Framework/Player/PolycodePlayer.app DESTINATION Player USE_SOURCE_PERMISSIONS)
 	INSTALL(DIRECTORY ${POLYCODE_RELEASE_DIR}/Framework/Player/StandalonePlayer.app DESTINATION Publish/Mac USE_SOURCE_PERMISSIONS)
-	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Bindings/Lua/Modules/2DPhysics/lib/Physics2D.dylib DESTINATION Modules/Physics2D/Lib/osx)
-	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Bindings/Lua/Modules/3DPhysics/lib/Physics3D.dylib DESTINATION Modules/Physics3D/Lib/osx)
-	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Bindings/Lua/Modules/UI/lib/UI.dylib DESTINATION Modules/UI/Lib/osx)
 
 INSTALL(PROGRAMS ${POLYCODE_RELEASE_DIR}/Framework/Tools/polybuild DESTINATION Bin)
 INSTALL(PROGRAMS ${POLYCODE_RELEASE_DIR}/Framework/Tools/polyimport DESTINATION Bin)
@@ -62,9 +53,6 @@ ELSE(MSVC OR MINGW)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/hdr.pak DESTINATION Publish/Linux)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/api.pak DESTINATION Publish/Linux)
 	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Player/main.polyapp DESTINATION Publish/Linux)
-	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Bindings/Lua/Modules/2DPhysics/lib/Physics2D.so DESTINATION Modules/Physics2D/Lib/linux)
-	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Bindings/Lua/Modules/3DPhysics/lib/Physics3D.so DESTINATION Modules/Physics3D/Lib/linux)
-	INSTALL(FILES ${POLYCODE_RELEASE_DIR}/Framework/Bindings/Lua/Modules/UI/lib/UI.so DESTINATION Modules/UI/Lib/linux)
 
 INSTALL(PROGRAMS ${POLYCODE_RELEASE_DIR}/Framework/Tools/polybuild DESTINATION Bin)
 INSTALL(PROGRAMS ${POLYCODE_RELEASE_DIR}/Framework/Tools/polyimport DESTINATION Bin)