Просмотр исходного кода

Linux fixes for core library and examples/template

Ivan Safrin 13 лет назад
Родитель
Сommit
a770a9bcbb

+ 4 - 0
Assets/Templates/C++/Linux/HelloPolycodeApp.cpp

@@ -12,6 +12,10 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) : EventHandler() {
 	screen->addChild(label);
 }
 
+HelloPolycodeApp::~HelloPolycodeApp() {
+
+}
+
 bool HelloPolycodeApp::Update() {
     return core->Update();
 }

+ 1 - 1
Assets/Templates/C++/Linux/Makefile

@@ -1,6 +1,6 @@
 CC=g++
 CFLAGS=-I../../Core/Dependencies/include -I../../Core/Dependencies/include/AL -I../../Core/include -I../../Modules/include -I../../Modules/Dependencies/include -I../../Modules/Dependencies/include/bullet
-LDFLAGS=-lrt -ldl -lpthread ../../Core/lib/libPolycore.a ../../Core/Dependencies/lib/libfreetype.a ../../Core/Dependencies/lib/liblibvorbisfile.a ../../Core/Dependencies/lib/liblibvorbis.a ../../Core/Dependencies/lib/liblibogg.a ../../Core/Dependencies/lib/libopenal.a ../../Core/Dependencies/lib/libphysfs.a ../../Core/Dependencies/lib/libpng15.a ../../Core/Dependencies/lib/libz.a -lGL -lGLU -lSDL ../../Modules/lib/libPolycode2DPhysics.a ../../Modules/Dependencies/lib/libBox2D.a ../../Modules/lib/libPolycode3DPhysics.a ../../Modules/Dependencies/lib/libBulletDynamics.a ../../Modules/Dependencies/lib/libBulletCollision.a ../../Modules/Dependencies/lib/libLinearMath.a ../../Modules/lib/libPolycodeNetworking.a
+LDFLAGS=-lrt -ldl -lpthread ../../Core/lib/libPolycore.a ../../Core/Dependencies/lib/libfreetype.a ../../Core/Dependencies/lib/liblibvorbisfile.a ../../Core/Dependencies/lib/liblibvorbis.a ../../Core/Dependencies/lib/liblibogg.a ../../Core/Dependencies/lib/libopenal.so ../../Core/Dependencies/lib/libphysfs.a ../../Core/Dependencies/lib/libpng15.a ../../Core/Dependencies/lib/libz.a -lGL -lGLU -lSDL ../../Modules/lib/libPolycode2DPhysics.a ../../Modules/Dependencies/lib/libBox2D.a ../../Modules/lib/libPolycode3DPhysics.a ../../Modules/Dependencies/lib/libBulletDynamics.a ../../Modules/Dependencies/lib/libBulletCollision.a ../../Modules/Dependencies/lib/libLinearMath.a
 
 default:
 	$(CC) $(CFLAGS) main.cpp HelloPolycodeApp.cpp -o PolycodeTemplate $(LDFLAGS)

+ 1 - 1
Core/Contents/Include/PolyGlobals.h

@@ -40,9 +40,9 @@ THE SOFTWARE.
 	#pragma warning(disable:4309)
 	#define NULL 0
 
-#include <stdint.h>
 
 #endif
+#include <stdint.h>
  
 #ifndef NULL
 	#define NULL 0

+ 1 - 0
Core/Contents/Include/PolySDLCore.h

@@ -66,6 +66,7 @@ namespace Polycode {
 		std::vector<String> openFilePicker(std::vector<CoreFileExtension> extensions, bool allowMultiple);
 		void resizeTo(int xRes, int yRes);
 
+		String executeExternalCommand(String command);
 		void openURL(String url);
 
 	private:

+ 2 - 1
Core/Contents/Source/PolyCore.cpp

@@ -26,7 +26,8 @@
 
 #ifdef _WINDOWS
 #include <windows.h>
-
+#else
+#include <unistd.h>
 #endif
 
 #include <time.h>

+ 5 - 1
Core/Contents/Source/PolySDLCore.cpp

@@ -49,7 +49,7 @@ void Core::getScreenInfo(int *width, int *height, int *hz) {
 	if (hz) *hz = 0;
 }
 
-SDLCore::SDLCore(PolycodeView *view, int _xRes, int _yRes, bool fullScreen, bool vSync, int aaLevel, int anisotropyLevel, int frameRate) : Core(_xRes, _yRes, fullScreen, vSync, aaLevel, anisotropyLevel, frameRate) {
+SDLCore::SDLCore(PolycodeView *view, int _xRes, int _yRes, bool fullScreen, bool vSync, int aaLevel, int anisotropyLevel, int frameRate, int monitorIndex) : Core(_xRes, _yRes, fullScreen, vSync, aaLevel, anisotropyLevel, frameRate, monitorIndex) {
 
 	String *windowTitle = (String*)view->windowData;
 
@@ -123,6 +123,10 @@ SDLCore::~SDLCore() {
 void SDLCore::openURL(String url) {
 }
 
+String SDLCore::executeExternalCommand(String command) {
+	
+}
+
 int SDLThreadFunc(void *data) {
 	Threaded *target = (Threaded*)data;
 	target->runThread();

+ 1 - 0
Core/Contents/Source/PolySocket.cpp

@@ -22,6 +22,7 @@ THE SOFTWARE.
 
 #include "PolySocket.h"
 #include "PolyLogger.h"
+#include <unistd.h>
 
 using namespace Polycode;
 using std::vector;

+ 1 - 1
Examples/C++/Build/Linux/Makefile

@@ -1,6 +1,6 @@
 CC=g++
 CFLAGS=-I../../Core/Dependencies/include -I../../Core/Dependencies/include/AL -I../../Core/include -I../../Modules/include -I../../Modules/Dependencies/include -I../../Modules/Dependencies/include/bullet
-LDFLAGS=-lrt -ldl -lpthread ../../Core/lib/libPolycore.a ../../Core/Dependencies/lib/libfreetype.a ../../Core/Dependencies/lib/liblibvorbisfile.a ../../Core/Dependencies/lib/liblibvorbis.a ../../Core/Dependencies/lib/liblibogg.a ../../Core/Dependencies/lib/libopenal.so ../../Core/Dependencies/lib/libphysfs.a ../../Core/Dependencies/lib/libpng15.a ../../Core/Dependencies/lib/libz.a -lGL -lGLU -lSDL ../../Modules/lib/libPolycode2DPhysics.a ../../Modules/Dependencies/lib/libBox2D.a ../../Modules/lib/libPolycode3DPhysics.a ../../Modules/Dependencies/lib/libBulletDynamics.a ../../Modules/Dependencies/lib/libBulletCollision.a ../../Modules/Dependencies/lib/libLinearMath.a ../../Modules/lib/libPolycodeNetworking.a
+LDFLAGS=-lrt -ldl -lpthread ../../Core/lib/libPolycore.a ../../Core/Dependencies/lib/libfreetype.a ../../Core/Dependencies/lib/liblibvorbisfile.a ../../Core/Dependencies/lib/liblibvorbis.a ../../Core/Dependencies/lib/liblibogg.a ../../Core/Dependencies/lib/libopenal.so ../../Core/Dependencies/lib/libphysfs.a ../../Core/Dependencies/lib/libpng15.a ../../Core/Dependencies/lib/libz.a -lGL -lGLU -lSDL ../../Modules/lib/libPolycode2DPhysics.a ../../Modules/Dependencies/lib/libBox2D.a ../../Modules/lib/libPolycode3DPhysics.a ../../Modules/Dependencies/lib/libBulletDynamics.a ../../Modules/Dependencies/lib/libBulletCollision.a ../../Modules/Dependencies/lib/libLinearMath.a
 
 default: 2DAudio 2DParticles 2DPhysics_Basic 2DPhysics_CollisionOnly 2DPhysics_Contacts 2DPhysics_Joints 2DPhysics_PointCollision 2DShapes 2DTransforms 3DAudio 3DBasics 3DMeshParticles 3DParticles 3DPhysics_Basic 3DPhysics_Character 3DPhysics_CollisionOnly 3DPhysics_Contacts 3DPhysics_RayTest 3DPhysics_Vehicle AdvancedLighting BasicImage BasicLighting BasicText EventHandling KeyboardInput MouseInput Networking_Client Networking_Server PlayingSounds ScreenEntities ScreenSprites SkeletalAnimation UpdateLoop  
 

+ 0 - 4
Examples/C++/Contents/PlayingSounds/HelloPolycodeApp.cpp

@@ -34,10 +34,6 @@ void HelloPolycodeApp::handleEvent(Event *e) {
 	}	
 }
 
-HelloPolycodeApp::~HelloPolycodeApp() {
-    
-}
-
 bool HelloPolycodeApp::Update() {
     return core->Update();
 }