diff --git a/JGE/JGE.vcxproj b/JGE/JGE.vcxproj
index bc14b3148..3501f9b5d 100644
--- a/JGE/JGE.vcxproj
+++ b/JGE/JGE.vcxproj
@@ -388,11 +388,8 @@
-
-
-
diff --git a/JGE/Makefile b/JGE/Makefile
index ea088f242..03a6cc22d 100644
--- a/JGE/Makefile
+++ b/JGE/Makefile
@@ -60,9 +60,6 @@ endif
ifeq ($(MAKECMDGOALS),3xx)
DEFAULT_RULE = 3xx
endif
-ifeq ($(MAKECMDGOALS),1xx)
-DEFAULT_RULE = 1xx
-endif
ifeq ($(DEFAULT_RULE),3xx)
TARGET_ARCHITECTURE = psp
@@ -70,12 +67,6 @@ TARGET_LIB = libjge300.a
CXXFLAGS += -DDEVHOOK -DPSPFW3XX
PSP_FW_VERSION=371
endif
-ifeq ($(DEFAULT_RULE),1xx)
-OBJS = $(GENERIC_OBJS) $(PSP_OBJS)
-TARGET_LIB = libjge100.a
-TARGET_ARCHITECTURE = psp
-PSP_FW_VERSION=150
-endif
ifeq ($(TARGET_ARCHITECTURE),psp)
PSPSDK = $(shell psp-config --pspsdk-path)
@@ -83,7 +74,7 @@ PSPDIR = $(shell psp-config --psp-prefix)
OBJS = $(GENERIC_OBJS) $(PSP_OBJS)
TARGET_HGE = libhgetools.a
INCDIR = include/psp include/psp/freetype2 ../Boost
-CXXFLAGS += -O2 -G0 -DPSPENV -DPSP
+CXXFLAGS += -O2 -G0 -DPSP
LIBDIR = lib/psp
endif
ifeq ($(TARGET_ARCHITECTURE),linux)
@@ -112,8 +103,6 @@ linux: $(TARGET_LIB) hge
3xx: $(TARGET_LIB)
-1xx: $(TARGET_LIB)
-
install: $(TARGET_LIB) hge
hge: $(TARGET_HGE)
diff --git a/JGE/include/DebugRoutines.h b/JGE/include/DebugRoutines.h
index 666ef4097..6546daea8 100644
--- a/JGE/include/DebugRoutines.h
+++ b/JGE/include/DebugRoutines.h
@@ -21,6 +21,10 @@ std::string ToHex(T* pointer)
return stream.str();
}
+#ifdef LINUX
+#define OutputDebugString(val) (std::cerr << val);
+#endif
+
#if defined (WIN32) || defined (LINUX)
#ifdef _DEBUG
@@ -29,7 +33,7 @@ std::string ToHex(T* pointer)
{ \
std::ostringstream stream; \
stream << inString << std::endl; \
- OutputDebugString(stream.str().c_str()); \
+ OutputDebugString(stream.str().c_str()); \
}
#else
#define DebugTrace(inString) \
@@ -47,7 +51,7 @@ std::string ToHex(T* pointer)
#ifndef DebugTrace
#define DebugTrace(inString) \
{ \
- std::cout << inString << std::endl; \
+ std::cerr << inString << std::endl; \
}
#endif //DEBUG
#endif
diff --git a/projects/mtg/Makefile b/projects/mtg/Makefile
index 98ecea153..bb9a15013 100644
--- a/projects/mtg/Makefile
+++ b/projects/mtg/Makefile
@@ -37,7 +37,7 @@ PSP_EBOOT_UNKPNG = pic0.png
PSP_EBOOT_PIC1 = pic1.png
INCDIR = ../../JGE/include ../../JGE/include/psp ../../JGE/include/psp/freetype2 ../../JGE/src ../../projects/mtg/include ../../Boost
LIBDIR = ../../JGE/lib/psp
-CFLAGS = -O2 -G0 -DPSPFW3XX -DDEVHOOK -DUSE_PRECOMPILED_HEADERS=1 -DPSPENV -DPSP
+CFLAGS = -O2 -G0 -DPSPFW3XX -DDEVHOOK -DUSE_PRECOMPILED_HEADERS=1 -DPSP
else
OBJS += objs/TestSuiteAI.o
INCDIR = -I../../JGE/include -I../../JGE/src -I/usr/X11/include -I../../projects/mtg/include -I../../Boost
@@ -56,15 +56,11 @@ CXXFLAGS += $(CFLAGS)
LDFLAGS += $(LIBS)
-
-
debug: CXXFLAGS += -ggdb3 -D_DEBUG -DDEBUG
log: CXXFLAGS += -DDOLOG
-
-
ifeq ($(TARGET_ARCHITECTURE),psp)
include $(PSPSDK)/lib/build.mak
diff --git a/projects/mtg/include/CacheEngine.h b/projects/mtg/include/CacheEngine.h
index f604a74fd..335c03258 100644
--- a/projects/mtg/include/CacheEngine.h
+++ b/projects/mtg/include/CacheEngine.h
@@ -188,7 +188,7 @@ protected:
// not sure this is necessary, adding it to potentially prevent SIGHUP on the psp
// rumour has it that if a worker thread doesn't allow the main thread a chance to run, it can hang the unit
-#ifdef PSPENV
+#ifdef PSP
boost::this_thread::sleep(boost::posix_time::milliseconds(10));
#endif
}
diff --git a/projects/mtg/include/WResourceManagerImpl.h b/projects/mtg/include/WResourceManagerImpl.h
index 645ce19d3..609eab793 100644
--- a/projects/mtg/include/WResourceManagerImpl.h
+++ b/projects/mtg/include/WResourceManagerImpl.h
@@ -97,7 +97,7 @@ protected:
return true;
}
-#if PSPENV
+#ifdef PSP
if (ramAvailableLineareMax() < MIN_LINEAR_RAM)
{
DebugTrace("Memory below minimum threshold!!");
diff --git a/projects/mtg/include/config.h b/projects/mtg/include/config.h
index fb70b3122..21def24bd 100644
--- a/projects/mtg/include/config.h
+++ b/projects/mtg/include/config.h
@@ -7,9 +7,6 @@
#if (defined (WIN32) || defined (LINUX)) && defined (_DEBUG)
#define TESTSUITE 1
-
-#else
-#define OutputDebugString(val) {}
#endif
#include "limits.h"
@@ -21,19 +18,6 @@
#define NEW new
#endif
-#ifdef QT_CONFIG
-#include
-#define OutputDebugString(val) qDebug(val)
-#else
-#ifdef LINUX
-#ifdef _DEBUG
-#define OutputDebugString(val) (std::cerr << val);
-#else
-#define OutputDebugString(val) {}
-#endif
-#endif
-#endif
-
#ifndef RESPATH
#define RESPATH "Res"
#endif
diff --git a/projects/mtg/src/utils.cpp b/projects/mtg/src/utils.cpp
index 2ca3ee3eb..8d5bd2e56 100644
--- a/projects/mtg/src/utils.cpp
+++ b/projects/mtg/src/utils.cpp
@@ -7,7 +7,7 @@
#include "WFont.h"
#include
-#ifdef PSPENV
+#ifdef PSP
#include "pspsdk.h"
#endif
@@ -164,7 +164,7 @@ u32 ramAvailableLineareMax(void)
size = 0;
sizeblock = RAM_BLOCK;
-#ifdef PSPENV
+#ifdef PSP
int disableInterrupts = pspSdkDisableInterrupts();
#endif
@@ -190,7 +190,7 @@ u32 ramAvailableLineareMax(void)
free(ram);
}
-#ifdef PSPENV
+#ifdef PSP
pspSdkEnableInterrupts(disableInterrupts);
#endif
@@ -207,7 +207,7 @@ u32 ramAvailable(void)
size = 0;
count = 0;
-#ifdef PSPENV
+#ifdef PSP
int disableInterrupts = pspSdkDisableInterrupts();
#endif
@@ -247,7 +247,7 @@ u32 ramAvailable(void)
free(ram);
}
-#ifdef PSPENV
+#ifdef PSP
pspSdkEnableInterrupts(disableInterrupts);
#endif
return size;
diff --git a/projects/mtg/template.vcxproj b/projects/mtg/template.vcxproj
index 9b99694ef..e9783d8ca 100644
--- a/projects/mtg/template.vcxproj
+++ b/projects/mtg/template.vcxproj
@@ -184,7 +184,6 @@
true
.\Debug/template.pdb
Windows
- true
false
@@ -425,8 +424,6 @@
-
-
diff --git a/projects/mtg/template.vcxproj.filters b/projects/mtg/template.vcxproj.filters
index 615b570b1..7a50d7447 100644
--- a/projects/mtg/template.vcxproj.filters
+++ b/projects/mtg/template.vcxproj.filters
@@ -627,8 +627,6 @@
-
-