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

Linux example and some Linux fixes

Ivan Safrin 14 лет назад
Родитель
Сommit
5529e265df

+ 0 - 1
.gitignore

@@ -41,7 +41,6 @@ IDE/Dependencies
 Tools/Dependencies
 Bindings/Dependencies
 IDE/Mac\ OS\ X
-Examples
 Debug
 Release
 Documentation

+ 1 - 1
Core/Build/Linux/Makefile

@@ -252,7 +252,7 @@ INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
 LD = /usr/bin/ld
-LDFLAGS = -lpng15 -lfreetype -logg -lvorbis -lvorbisfile -lphysfs -lopenal -lglut -lGL -lGLU 
+LDFLAGS = 
 LIBOBJS = 
 LIBS = -lGLU -lGL -lSDL -lopenal -lphysfs -lvorbisfile -lvorbis -lfreetype -lpng15 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool

Разница между файлами не показана из-за своего большого размера
+ 0 - 1
Core/Build/Linux/Makefile.am


+ 1 - 1
Core/Build/Linux/Makefile.in

@@ -252,7 +252,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
-LDFLAGS = -lpng15 -lfreetype -logg -lvorbis -lvorbisfile -lphysfs -lopenal -lglut -lGL -lGLU 
+LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@

+ 1 - 1
Core/Build/Linux/autom4te.cache/output.2

@@ -14506,7 +14506,7 @@ _ACEOF
 
 else
   
-		echo "libpng is required!"
+		echo "libvorbisfile is required!"
 		exit -1
 fi
 

+ 1 - 1
Core/Build/Linux/autom4te.cache/output.3

@@ -14510,7 +14510,7 @@ _ACEOF
 
 else
   
-		echo "libpng is required!"
+		echo "libvorbisfile is required!"
 		exit -1
 fi
 

+ 1 - 1
Core/Build/Linux/configure

@@ -14506,7 +14506,7 @@ _ACEOF
 
 else
 
-		echo "libpng is required!"
+		echo "libvorbisfile is required!"
 		exit -1
 fi
 

+ 1 - 1
Core/Build/Linux/configure.ac

@@ -29,7 +29,7 @@ AC_CHECK_LIB([vorbis], [vorbis_info_init],[], [
 		exit -1])
 
 AC_CHECK_LIB([vorbisfile], [ov_open_callbacks],[], [
-		echo "libpng is required!"
+		echo "libvorbisfile is required!"
 		exit -1])
 
 AC_CHECK_LIB([physfs], [PHYSFS_init],[], [

+ 15 - 0
Examples/C++/BasicImage/HelloPolycodeApp.cpp

@@ -0,0 +1,15 @@
+#include "HelloPolycodeApp.h"
+
+HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) : EventHandler() {
+    	core = new SDLCore(view, 640,480,false,0,90);	  
+	CoreServices::getInstance()->getResourceManager()->addArchive("default.pak");
+	CoreServices::getInstance()->getResourceManager()->addDirResource("default", false);
+
+	Screen *screen = new Screen();			
+	ScreenImage *image = new ScreenImage("polycode_logo.png");
+	screen->addChild(image);	
+}
+
+bool HelloPolycodeApp::Update() {
+    return core->Update();
+}

+ 14 - 0
Examples/C++/BasicImage/HelloPolycodeApp.h

@@ -0,0 +1,14 @@
+#include <Polycode.h>
+#include "PolycodeView.h"
+
+using namespace Polycode;
+
+class HelloPolycodeApp : public EventHandler {
+public:
+    HelloPolycodeApp(PolycodeView *view);
+    ~HelloPolycodeApp();
+    bool Update();
+    
+private:
+	Core *core;
+};

+ 10 - 0
Examples/C++/BasicImage/main.cpp

@@ -0,0 +1,10 @@
+#include "Polycode.h"
+#include "PolycodeView.h"
+#include "HelloPolycodeApp.h"
+
+int main(int argc, char *argv[]) {
+	PolycodeView *view = new PolycodeView("Hello Polycode!");
+	HelloPolycodeApp *app = new HelloPolycodeApp(view);
+	while(app->Update()) {}
+	return 0;
+}

+ 2 - 0
Examples/C++/Makefile

@@ -0,0 +1,2 @@
+default:
+	g++ -g -I/usr/local/include/freetype2 -I/usr/local/include/AL -IBasicImage -lPolyCore BasicImage/HelloPolycodeApp.cpp BasicImage/main.cpp -o basic_image

BIN
Examples/C++/default.pak


BIN
Examples/C++/polycode_logo.png


+ 30 - 0
Modules/Build/Linux/configure.ac

@@ -0,0 +1,30 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ([2.67])
+
+AC_INIT([libPolyCore], [0.8.2], [[email protected]])
+AC_CONFIG_FILES([Makefile])
+AM_INIT_AUTOMAKE([libPolyCore], [0.8.2])
+
+LT_INIT()
+
+AC_PROG_RANLIB
+AC_PROG_LIBTOOL
+AC_PROG_CXX
+# Checks for programs.
+
+# Checks for libraries.
+
+AC_CHECK_LIB([PolyCore], [png_create_read_struct],[], [
+		echo "libpng is required!"
+		exit -1])
+
+# Checks for header files.
+
+# Checks for typedefs, structures, and compiler characteristics.
+
+# Checks for library functions.
+
+
+AC_OUTPUT

Некоторые файлы не были показаны из-за большого количества измененных файлов