Minor project cleanup:
- Consolidated duplicate PSP / PSPENV defines; - removed some ancillary file crap from the 2010 projects; - pulled 1xx references from the makefiles; - consolidated multiple #defines for OutputDebugString into one header (previously was split between config.h & DebugRoutines.h).
This commit is contained in:
@@ -388,11 +388,8 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Makefile" />
|
||||
<None Include="Makefile.1xx" />
|
||||
<None Include="Makefile.3xx" />
|
||||
<None Include="Makefile.hge" />
|
||||
<None Include="readme.txt" />
|
||||
<None Include="..\Tutorials\02.RenderingImages\Images.sln" />
|
||||
<None Include="..\projects\mtg\mtg.vsprops" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
|
||||
13
JGE/Makefile
13
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)
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user