mirror of
https://github.com/SWG-Source/src.git
synced 2026-09-11 23:45:01 -04:00
Merged in master branch
This commit is contained in:
@@ -0,0 +1,20 @@
|
||||
name: SWG Source - Continuous Integration for src repo
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches: [ master ]
|
||||
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
compile-src:
|
||||
runs-on: ubuntu-latest
|
||||
container: cekisswg/swg-vm3.01-i386:latest
|
||||
steps:
|
||||
- name: Run ANT Build
|
||||
run: |
|
||||
cd /home/swg/swg-main
|
||||
git clone https://github.com/SWG-Source/src.git
|
||||
cd src
|
||||
ant build_src
|
||||
|
||||
@@ -15,7 +15,7 @@ Only use the Debug and Release targets unless you want to work on 64 bit (MODE=R
|
||||
|
||||
For production, user facing builds, set MODE=MINSIZEREL for profile built, heavily optimized versions of the binaries.
|
||||
|
||||
## Profiling and Using Profiles
|
||||
## Profiling and Using Profiles (IN-WORK)
|
||||
|
||||
To generate new profiles, build SWG with MODE=RELWITHDEBINFO.
|
||||
|
||||
@@ -35,6 +35,6 @@ See http://clang.llvm.org/docs/UsersManual.html#profiling-with-instrumentation f
|
||||
|
||||
# More Information
|
||||
|
||||
See http://www.swgsource.com/ for more information on the SWG Source project.
|
||||
See https://swg-source.github.io/ for more information on the SWG Source project.
|
||||
|
||||
Join the SWGSource Discord if you would like to contribute: https://discord.gg/j53cMj9
|
||||
|
||||
@@ -100,6 +100,7 @@ set(JAVA_AWT_LIBRARY_DIRECTORIES
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/lib"
|
||||
)
|
||||
|
||||
file(TO_CMAKE_PATH "$ENV{JAVA32_HOME}" _JAVA32_HOME)
|
||||
file(TO_CMAKE_PATH "$ENV{JAVA_HOME}" _JAVA_HOME)
|
||||
|
||||
JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
|
||||
@@ -113,6 +114,12 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
|
||||
/opt/java18/jre/lib
|
||||
/opt/java18/jre/bin
|
||||
/opt/java18/jre/bin/classic
|
||||
${_JAVA32_HOME}/jre/lib/{libarch}
|
||||
${_JAVA32_HOME}/jre/lib
|
||||
${_JAVA32_HOME}/jre/bin
|
||||
${_JAVA32_HOME}/jre/bin/classic
|
||||
${_JAVA32_HOME}/lib
|
||||
${_JAVA32_HOME}
|
||||
${_JAVA_HOME}/jre/lib/{libarch}
|
||||
${_JAVA_HOME}/jre/lib
|
||||
${_JAVA_HOME}/jre/bin
|
||||
@@ -172,6 +179,7 @@ set(JAVA_AWT_INCLUDE_DIRECTORIES
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
|
||||
${_JAVA32_HOME}/include
|
||||
${_JAVA_HOME}/include
|
||||
/opt/java18/include
|
||||
/opt/java/include
|
||||
|
||||
@@ -1,7 +1,4 @@
|
||||
|
||||
find_path(LIBXML2_ROOT
|
||||
NAMES include/zlib.h
|
||||
)
|
||||
|
||||
find_path(LIBXML2_INCLUDE_DIR libxml/xpath.h
|
||||
HINTS
|
||||
|
||||
@@ -1,8 +1,3 @@
|
||||
|
||||
find_path(PCRE_ROOT
|
||||
NAMES include/pcre.h
|
||||
)
|
||||
|
||||
find_path(PCRE_INCLUDE_DIR pcre.h
|
||||
HINTS
|
||||
$ENV{PCRE_ROOT}
|
||||
|
||||
@@ -8,6 +8,8 @@
|
||||
#ifndef REMOTE_DEBUG_H
|
||||
#define REMOTE_DEBUG_H
|
||||
|
||||
#include <string>
|
||||
|
||||
// ======================================================================
|
||||
|
||||
/** This class is both a platform and network-protocol independent way of
|
||||
|
||||
Reference in New Issue
Block a user