Răsfoiți Sursa

Linux module binding fixes

Ivan Safrin 14 ani în urmă
părinte
comite
1cc2ac3d82

+ 0 - 15
Bindings/Contents/LUA/API/Polycode/CoreInput.lua

@@ -7,23 +7,8 @@ class "CoreInput" (EventDispatcher)
 MOUSE_BUTTON1 = 0
 MOUSE_BUTTON1 = 0
 MOUSE_BUTTON2 = 1
 MOUSE_BUTTON2 = 1
 MOUSE_BUTTON3 = 2
 MOUSE_BUTTON3 = 2
-function CoreInput:__index__(name)
-	if name == "PolyCore" then
-		retVal = Polycore.CoreInput_get_PolyCore(self.__ptr)
-		if Polycore.__ptr_lookup[retVal] ~= nil then
-			return Polycore.__ptr_lookup[retVal]
-		else
-			Polycore.__ptr_lookup[retVal] = friend class("__skip_ptr__")
-			Polycore.__ptr_lookup[retVal].__ptr = retVal
-			return Polycore.__ptr_lookup[retVal]
-		end
-	end
-end
 
 
 
 
-function CoreInput:__set_callback(name,value)
-	return false
-end
 
 
 
 
 function CoreInput:CoreInput(...)
 function CoreInput:CoreInput(...)

Fișier diff suprimat deoarece este prea mare
+ 664 - 542
Bindings/Contents/LUA/Include/PolycodeLUAWrappers.h


Fișier diff suprimat deoarece este prea mare
+ 259 - 859
Bindings/Contents/LUA/Source/PolycodeLUA.cpp


+ 8 - 2
Modules/Bindings/2DPhysics/CMakeLists.txt

@@ -28,12 +28,18 @@ ADD_LIBRARY(Physics2D SHARED ${polycode2DPhysics_SRCS} ${polycode2DPhysics_HDRS}
 SET(CMAKE_DEBUG_POSTFIX "_d")
 SET(CMAKE_DEBUG_POSTFIX "_d")
 
 
 SET_TARGET_PROPERTIES(Physics2D PROPERTIES PREFIX "")
 SET_TARGET_PROPERTIES(Physics2D PROPERTIES PREFIX "")
+
+
+IF(MSVC)
+ELSEIF(APPLE)
+    SET(EXTRA_LIBS "-framework Cocoa" "-frameword IOKit")
+ELSE(MSVC)
+ENDIF(MSVC)
+
 TARGET_LINK_LIBRARIES(Physics2D
 TARGET_LINK_LIBRARIES(Physics2D
 	Polycore
 	Polycore
 	${LUA_LIBRARY}
 	${LUA_LIBRARY}
 	${BOX2D_RELEASE_LIBRARY}
 	${BOX2D_RELEASE_LIBRARY}
-        "-framework Cocoa"
-        "-framework IOKit"
         ${OPENGL_LIBRARIES}
         ${OPENGL_LIBRARIES}
         ${OPENAL_LIBRARY}
         ${OPENAL_LIBRARY}
         ${PNG_LIBRARIES}
         ${PNG_LIBRARIES}

+ 6 - 2
Modules/Bindings/3DPhysics/CMakeLists.txt

@@ -35,12 +35,16 @@ SET(CMAKE_DEBUG_POSTFIX "_d")
 
 
 SET_TARGET_PROPERTIES(Physics3D PROPERTIES PREFIX "")
 SET_TARGET_PROPERTIES(Physics3D PROPERTIES PREFIX "")
 
 
+IF(MSVC)
+ELSEIF(APPLE)
+    SET(EXTRA_LIBS "-framework Cocoa" "-frameword IOKit")
+ELSE(MSVC)
+ENDIF(MSVC)
+
 TARGET_LINK_LIBRARIES(Physics3D
 TARGET_LINK_LIBRARIES(Physics3D
 	Polycore
 	Polycore
 	${LUA_LIBRARY}
 	${LUA_LIBRARY}
 	${BULLET_LIBRARIES}
 	${BULLET_LIBRARIES}
-        "-framework Cocoa"
-        "-framework IOKit"
         ${OPENGL_LIBRARIES}
         ${OPENGL_LIBRARIES}
         ${OPENAL_LIBRARY}
         ${OPENAL_LIBRARY}
         ${PNG_LIBRARIES}
         ${PNG_LIBRARIES}

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff