- Makefiles:

- Fix typo, correctly adding SDL libs to the tools on OS X so that makesdlkeytrans builds. - Move all mention of $(LIBS) out of build/Makefile into build/Makefile.shared because no linking takes place in the engine itself so LIBS additions were lost. This should fix USE_LIBPNG=1 on Windows at least. - Other assorted cleanup. git-svn-id: https://svn.eduke32.com/eduke32@2523 1a8010ca-5511-0410-912e-c29ae57300e0
2024-11-10 23:02:03 +00:00 · 2012-03-24 08:30:28 +00:00 · 2012-03-24 08:30:28 +00:00 · 0122764017
commit 0122764017
parent 62dd05a2e5
6 changed files with 62 additions and 61 deletions
--- a/polymer/eduke32/Makefile.common
+++ b/polymer/eduke32/Makefile.common
@ -93,7 +93,7 @@ BASELDFLAGS=

 LIBS=-lm
 ifneq (0,$(USE_LIBPNG))
-    LIBS+= -lpng
+    LIBS+= -lpng -lz
 endif
 ifneq (0,$(USE_LIBVPX))
    # On Windows, we link statically to libvpx
--- a/polymer/eduke32/build/Makefile
+++ b/polymer/eduke32/build/Makefile
@ -44,7 +44,6 @@ ifneq ($(RELEASE),0)
 else
    # Debugging enabled
    debug+= -DNOSDLPARACHUTE
-    LIBS+= $(L_SSP) -Wl,--enable-auto-import
 endif

 include Makefile.shared
@ -72,19 +71,6 @@ else
  ENGINEOBJS+= $(OBJ)/a-c.$o
 endif

-ifneq ($(PLATFORM),WINDOWS)
-    LIBS+= -ldl -pthread
-    ifneq ($(USE_LIBPNG),0)
-        LIBS+= -LWindows/lib -lpng -lz
-        OURCFLAGS+= -IWindows/include
-    endif
-endif
-ifeq ($(PLATFORM),DARWIN)
-    ifneq ($(USE_LIBPNG),0)
-        OURCFLAGS+= -I/opt/local/include -I/usr/local/include
-        LIBS+= -L/opt/local/lib -L/usr/local/lib -lpng -lz
-    endif
-endif


 ENGINEOBJS+= \
@ -141,7 +127,6 @@ ifeq ($(PLATFORM),BSD)
 endif
 ifeq ($(PLATFORM),WINDOWS)
    OURCFLAGS+= -DUNDERSCORES -I$(DXROOT)/include -I$(FMODROOTWIN)/inc # -I$(ENETROOT)/include
-    LIBS+= -lwsock32 -lws2_32 -lwinmm #-L$(ENETROOT)
    OURASFLAGS+= -DUNDERSCORES -f win32
 endif
 ifeq ($(PLATFORM),BEOS)
@ -160,7 +145,7 @@ ifeq ($(RENDERTYPE),SDL)
            OURCFLAGS += -I$(APPLE_FRAMEWORKS)/SDL.framework/Headers \
                    -I$(APPLE_FRAMEWORKS)/SDL_mixer.framework/Headers
            UTILLIBS += -read_only_relocs suppress \
-                    -Wl,-framework,SDL -Wl,-framework,SDL_mixer Apple/lib/libSDLmain.a
+                    -Wl,-framework,SDL -Wl,-framework,SDL_mixer ../Apple/lib/libSDLmain.a
        else
            OURCFLAGS += -I$(SDLROOT)/include -I$(SDLROOT)/include/SDL
            UTILLIBS += -read_only_relocs suppress -lSDL_mixer
--- a/polymer/eduke32/build/Makefile.shared
+++ b/polymer/eduke32/build/Makefile.shared
@ -245,6 +245,31 @@ ifeq (0,$(STATICSTDCPP))
    STATICSTDCPP= -shared
 endif

+
+ifneq ($(PLATFORM),WINDOWS)
+    LIBS+= -ldl -pthread
+endif
+
+ifeq ($(PLATFORM),WINDOWS)
+    ifneq ($(USE_LIBPNG),0)
+        LIBS+= -LWindows/lib -lpng -lz
+        BUILDCFLAGS+= -IWindows/include
+    endif
+endif
+ifeq ($(PLATFORM),DARWIN)
+    ifneq ($(USE_LIBPNG),0)
+        BUILDCFLAGS+= -I/opt/local/include -I/usr/local/include
+        LIBS+= -L/opt/local/lib -L/usr/local/lib -lpng -lz
+    endif
+endif
+
+LIBS+= $(L_SSP) -Wl,--enable-auto-import
+
+ifeq ($(PLATFORM),WINDOWS)
+    LIBS+= -lwsock32 -lws2_32 -lwinmm #-L$(ENETROOT)
+endif
+
+
 ifeq ($(PRETTY_OUTPUT),1)
 BUILD_STARTED = printf "\033[K\033[1;36mBuild started using \"$(CC) $(OURCFLAGS) $(OURCONLYFLAGS) $(OURCXXFLAGS)\"\033[0m\n"
 BUILD_ECHOFLAGS = printf "\033[K\033[1;36mEnded compilation in this directory using \"$(CC) $(OURCFLAGS) $(OURCONLYFLAGS) $(OURCXXFLAGS)\"\033[0m\n"
--- a/polymer/eduke32/build/src/util/arttool.cc
+++ b/polymer/eduke32/build/src/util/arttool.cc
@ -4,11 +4,10 @@
 * @license Artistic License 2.0 (http://www.perlfoundation.org/artistic_license_2_0)
 */

-#include <iostream>
+#include <cstdio>
 #include <fstream>
 #include <cstring>
 #include <string>
-#include <cstdlib>

 #include "compat.h"

@ -16,35 +15,35 @@ using namespace std;

 void usage()
 {
-    cout << "BUILD ART file editing tool" << endl;
-    cout << "Copyright (C) 2008 Jonathon Fowler <jf@jonof.id.au>" << endl;
-    cout << "Released under the Artistic License 2.0" << endl;
-    cout << endl;
-    cout << "  arttool create [options]" << endl;
-    cout << "    -f <filenum>   Selects which numbered ART file to create (default 0)" << endl;
-    cout << "    -o <offset>    Specifies the first tile in the file (default 0)" << endl;
-    cout << "    -n <ntiles>    The number of tiles for the art file (default 256)" << endl;
-    cout << "    Creates an empty ART file named 'tilesXXX.art'" << endl;
-    cout << endl;
-    cout << "  arttool addtile [options] <tilenum> <filename>" << endl;
-    cout << "    -x <pixels>    X-centre" << endl;
-    cout << "    -y <pixels>    Y-centre" << endl;
-    cout << "    -ann <frames>  Animation frame span" << endl;
-    cout << "    -ant <type>    Animation type (0=none, 1=oscillate, 2=forward, 3=reverse)" << endl;
-    cout << "    -ans <speed>   Animation speed" << endl;
-    cout << "    Adds a tile to the 'tilesXXX.art' set from a TGA or PCX source" << endl;
-    cout << endl;
-    cout << "  arttool rmtile <tilenum>" << endl;
-    cout << "    Removes a tile from the 'tilesXXX.art' set" << endl;
-    cout << endl;
-    cout << "  arttool tileprop [options] <tilenum>" << endl;
-    cout << "    -x <pixels>    X-centre" << endl;
-    cout << "    -y <pixels>    Y-centre" << endl;
-    cout << "    -ann <frames>  Animation frame span, may be -ve" << endl;
-    cout << "    -ant <type>    Animation type (0=none, 1=oscillate, 2=forward, 3=reverse)" << endl;
-    cout << "    -ans <speed>   Animation speed" << endl;
-    cout << "    Changes tile properties" << endl;
-    cout << endl;
+    Bprintf("BUILD ART file editing tool\n");
+    Bprintf("Copyright (C) 2008 Jonathon Fowler <jf@jonof.id.au>\n");
+    Bprintf("Released under the Artistic License 2.0\n");
+    Bprintf("\n");
+    Bprintf("  arttool create [options]\n");
+    Bprintf("    -f <filenum>   Selects which numbered ART file to create (default 0)\n");
+    Bprintf("    -o <offset>    Specifies the first tile in the file (default 0)\n");
+    Bprintf("    -n <ntiles>    The number of tiles for the art file (default 256)\n");
+    Bprintf("    Creates an empty ART file named 'tilesXXX.art'\n");
+    Bprintf("\n");
+    Bprintf("  arttool addtile [options] <tilenum> <filename>\n");
+    Bprintf("    -x <pixels>    X-centre\n");
+    Bprintf("    -y <pixels>    Y-centre\n");
+    Bprintf("    -ann <frames>  Animation frame span\n");
+    Bprintf("    -ant <type>    Animation type (0=none, 1=oscillate, 2=forward, 3=reverse)\n");
+    Bprintf("    -ans <speed>   Animation speed\n");
+    Bprintf("    Adds a tile to the 'tilesXXX.art' set from a TGA or PCX source\n");
+    Bprintf("\n");
+    Bprintf("  arttool rmtile <tilenum>\n");
+    Bprintf("    Removes a tile from the 'tilesXXX.art' set\n");
+    Bprintf("\n");
+    Bprintf("  arttool tileprop [options] <tilenum>\n");
+    Bprintf("    -x <pixels>    X-centre\n");
+    Bprintf("    -y <pixels>    Y-centre\n");
+    Bprintf("    -ann <frames>  Animation frame span, may be -ve\n");
+    Bprintf("    -ant <type>    Animation type (0=none, 1=oscillate, 2=forward, 3=reverse)\n");
+    Bprintf("    -ans <speed>   Animation speed\n");
+    Bprintf("    Changes tile properties\n");
+    Bprintf("\n");
 }

 class ARTFile {
@ -893,7 +892,7 @@ int main(int argc, char ** argv)
                    switch (err = oper->setOption(opt, value)) {
                        case Operation::ERR_NO_ERROR: break;
                        default:
-                            cerr << "error: " << Operation::translateResult(err) << endl;
+                            Bfprintf(stderr, "error: %s\n", Operation::translateResult(err));
                            showusage = 2;
                            break;
                    }
@ -902,7 +901,7 @@ int main(int argc, char ** argv)
                    switch (oper->setParameter(unnamedParm, value)) {
                        case Operation::ERR_NO_ERROR: break;
                        default:
-                            cerr << "error: " << Operation::translateResult(err) << endl;
+                            Bfprintf(stderr, "error: %s\n", Operation::translateResult(err));
                            showusage = 2;
                            break;
                    }
@ -923,7 +922,7 @@ int main(int argc, char ** argv)
        switch (err) {
            case Operation::ERR_NO_ERROR: return 0;
            default:
-                cerr << "error: " << Operation::translateResult(err) << endl;
+                Bfprintf(stderr, "error: %s\n", Operation::translateResult(err));
                return 1;
        }
    }
--- a/polymer/eduke32/build/src/util/generateicon.c
+++ b/polymer/eduke32/build/src/util/generateicon.c
@ -1,3 +1,5 @@
+
+#include <stdio.h>
 #include "inttypes.h"
 #include "kplib.h"
 #include "compat.h"
--- a/polymer/eduke32/build/src/util/kmd2tool.c
+++ b/polymer/eduke32/build/src/util/kmd2tool.c
@ -1,11 +1,5 @@
-#if 0
-kmd2tool.exe: kmd2tool.c; cl kmd2tool.c /Ox /G6fy /MD /link /opt:nowin98
-    del kmd2tool.obj
-!if 0
-#endif

 #include <stdio.h>
-#include <io.h>
 #include <math.h>
 #include "compat.h"

@ -95,7 +89,3 @@ int main (const int argc, const char **argv)

    return(0);
 }
-
-#if 0
-!endif
-#endif