Commit 175a47a7 by root

Initial changes for 1804 - mainly png12 to png16

1 parent f6250647
......@@ -9,7 +9,7 @@ CXX = g++
CXXFLAGS = -Wall -fPIC -ggdb3
CPPFLAGS = -I$(ROOT) -I$(ROOT)/DCE $(SNR_CPPFLAGS)
LDFLAGS = $(SNR_LDFLAGS) -L$(ROOT)/lib
BASELDLIBS = -lSerializeClass -lDCECommon -lPlutoUtils -lpthread -lpng12 -lz
BASELDLIBS = -lSerializeClass -lDCECommon -lPlutoUtils -lpthread -lpng16 -lz
MYSQL_FLAGS := $(shell pkg-config --cflags mysqlclient 2>/dev/null)
MYSQL_LIBS := $(shell pkg-config --libs mysqlclient 2>/dev/null)
......
......@@ -28,6 +28,7 @@ using namespace std;
#include "../VIPShared/MenuData.h"
#include "../VIPShared/MenuItemInfo.h"
#include "../VIPShared/PhoneConfig.h"
#include <zlib.h>
//-----------------------------------------------------------------------------------------------------
class BDCommandProcessor;
class DataGridRenderer_Bluetooth;
......
SNR_CPPFLAGS ?= -DKDE_LMCE -DDEBUG -DTHREAD_LOG -DLOG_ALL_QUERIES
ROOT = ..
CXXFLAGS += -Wall -ggdb3 -DxAUDIDEMO -fmessage-length=0
CXXFLAGS += -Wall -ggdb3 -DxAUDIDEMO -fmessage-length=0 -std=c++11
CPPFLAGS += -I$(ROOT)/ -I$(ROOT)/DCE -D_REENTRANT -D_GNU_SOURCE $(SNR_CPPFLAGS) -DUSE_LZO_DATAGRID -I/usr/include/libxml2/
LDFLAGS += -L$(ROOT)/lib -lxml2
......@@ -73,10 +73,10 @@ install:
cp LessDCERouter.sh $(DESTDIR)/usr/bin
mkdir -p $(DESTDIR)/usr/pluto/bin
cp DCERouter $(DESTDIR)/usr/pluto/bin
cp Orbiter_Win32.dat $(DESTDIR)/usr/pluto/bin || :
cp Orbiter_CeNet4_XScale.dat $(DESTDIR)/usr/pluto/bin || :
cp Symbian Series 60 mobile.vmc $(DESTDIR)/usr/pluto/bin || :
cp Windows Mobile Smartphone.vmc $(DESTDIR)/usr/pluto/bin || :
cp Orbiter_CeNet4_x86.dat $(DESTDIR)/usr/pluto/bin || :
cp Orbiter_Win32.dat $(DESTDIR)/usr/pluto/bin || touch $(DESTDIR)/usr/pluto/bin/Orbiter_Win32.dat
cp Orbiter_CeNet4_XScale.dat $(DESTDIR)/usr/pluto/bin || touch $(DESTDIR)/usr/pluto/bin/Orbiter_Ce_Net4_XScale.dat
cp Symbian Series 60 mobile.vmc $(DESTDIR)/usr/pluto/bin || touch "$(DESTDIR)/usr/pluto/bin/Symbian Series 60 mobile.vmc"
cp Windows Mobile Smartphone.vmc $(DESTDIR)/usr/pluto/bin || touch "$(DESTDIR)/usr/pluto/bin/Windows Mobile Smartphone.vmc"
cp Orbiter_CeNet4_x86.dat $(DESTDIR)/usr/pluto/bin || touch $(DESTDIR)/usr/pluto/bin/Orbiter_CeNet4_x86.dat
cp discovery.py $(DESTDIR)/usr/pluto/bin
cp startup-script.sh $(DESTDIR)/usr/pluto/bin
cp startup-script.sh $(DESTDIR)/usr/pluto/bin || touch $(DESTDIR)/usr/pluto/bin/startup-script.sh
......@@ -17,7 +17,7 @@
#define SDL_DEFS_H
#include <SDL.h>
#include <zlib.h>
#if SDL_BYTEORDER == SDL_BIG_ENDIAN
const Uint32 rmask = 0xff000000;
const Uint32 gmask = 0x00ff0000;
......
......@@ -18,6 +18,7 @@
#include <stdio.h>
#include "SDL.h"
#include <zlib.h>
#include <string>
using namespace std;
......
// Do NOT edit this file, it is automatically generated prior to build.
#ifndef VERSION
#define VERSION "<=version=>"
#define VERSION "2.0.0.48.201804251255+a4fa9316"
#endif
#ifndef LMCE_version_h
......@@ -11,7 +11,7 @@
extern const char *g_szCompile_Date;
extern const char *g_szSourceRevision;
#else
const char *g_szCompile_Date="<=compile_date=>";
const char *g_szSourceRevision="<=source_revision=>";
const char *g_szCompile_Date="Wed Apr 25 12:55:15 UTC 2018";
const char *g_szSourceRevision="a4fa9316";
#endif
#endif
  • libpng16 has been reverted to libpng12 until the makefiles can be appropriately updated to select the correct version. this change broke builds on all previous versions. src/version.h needs to be reverted still as it should not have been committed with data in it.

Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!