J :
* Have JGE compile on Darwin architecture. * I'm not saying it works, just that it compiles. * This needs testing on other macs than just mine.
This commit is contained in:
@@ -81,7 +81,7 @@ ifeq ($(TARGET_ARCHITECTURE),linux)
|
||||
OBJS = $(GENERIC_OBJS) $(LINUX_OBJS)
|
||||
TARGET_LIB = libjge.a
|
||||
TARGET_HGE = libhgetools.a
|
||||
INCDIR = $(shell freetype-config --cflags 2> /dev/null)
|
||||
INCDIR = $(shell freetype-config --cflags 2> /dev/null) -I/usr/X11/include
|
||||
CXXFLAGS += -DLINUX
|
||||
CXXFLAGS += $(INCDIR)
|
||||
LIBDIR = lib/linux
|
||||
|
||||
@@ -80,12 +80,14 @@
|
||||
typedef unsigned char BYTE;
|
||||
typedef bool BOOL;
|
||||
#endif
|
||||
#if defined (WIN32) || defined (LINUX)
|
||||
|
||||
#if defined (WIN32) || defined (LINUX)
|
||||
#include <GL/gl.h>
|
||||
#include <GL/glu.h>
|
||||
#endif
|
||||
|
||||
#include "../Dependencies/include/fmod.h"
|
||||
#if defined (WIN32) || defined (LINUX)
|
||||
#include "../Dependencies/include/fmod.h"
|
||||
|
||||
|
||||
typedef int8_t s8;
|
||||
|
||||
@@ -43,9 +43,12 @@ void JNetwork::EndInstance(){
|
||||
|
||||
|
||||
|
||||
#if defined (WIN32) || defined (LINUX)
|
||||
#if defined (WIN32)
|
||||
DWORD JNetwork::netthread = 0;
|
||||
int JNetwork::connected_to_ap = 1;
|
||||
#elif defined (LINUX)
|
||||
pthread_t JNetwork::netthread = NULL;
|
||||
int JNetwork::connected_to_ap = 1;
|
||||
#else
|
||||
int JNetwork::connected_to_ap = 0;
|
||||
int JNetwork::netthread = 0;
|
||||
|
||||
Reference in New Issue
Block a user