Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

J :

Browse Source 
* 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:
jean.chalard
2010-02-01 02:49:26 +00:00
parent aa5eb90299
commit e3e50c19a5
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
JGE/Makefile
View File

@@ -81,7 +81,7 @@ ifeq ($(TARGET_ARCHITECTURE),linux)
OBJS = $(GENERIC_OBJS) $(LINUX_OBJS) OBJS = $(GENERIC_OBJS) $(LINUX_OBJS)
TARGET_LIB = libjge.a TARGET_LIB = libjge.a
TARGET_HGE = libhgetools.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 += -DLINUX
CXXFLAGS += $(INCDIR) CXXFLAGS += $(INCDIR)
LIBDIR = lib/linux LIBDIR = lib/linux

6
JGE/include/JTypes.h
View File

@@ -80,12 +80,14 @@
typedef unsigned char BYTE; typedef unsigned char BYTE;
typedef bool BOOL; typedef bool BOOL;
#endif #endif
#if defined (WIN32) || defined (LINUX)
#if defined (WIN32) || defined (LINUX)
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.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; typedef int8_t s8;

5
JGE/src/JNetwork.cpp
View File

@@ -43,9 +43,12 @@ void JNetwork::EndInstance(){
#if defined (WIN32) || defined (LINUX) #if defined (WIN32)
DWORD JNetwork::netthread = 0; DWORD JNetwork::netthread = 0;
int JNetwork::connected_to_ap = 1; int JNetwork::connected_to_ap = 1;
#elif defined (LINUX)
pthread_t JNetwork::netthread = NULL;
int JNetwork::connected_to_ap = 1;
#else #else
int JNetwork::connected_to_ap = 0; int JNetwork::connected_to_ap = 0;
int JNetwork::netthread = 0; int JNetwork::netthread = 0;